From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB0EBC433F5 for ; Mon, 23 May 2022 13:48:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5ABE36B0006; Mon, 23 May 2022 09:48:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 55C306B0007; Mon, 23 May 2022 09:48:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 44B046B0008; Mon, 23 May 2022 09:48:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 357366B0006 for ; Mon, 23 May 2022 09:48:28 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 11DAE21068 for ; Mon, 23 May 2022 13:48:28 +0000 (UTC) X-FDA: 79497137496.27.518E814 Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by imf17.hostedemail.com (Postfix) with ESMTP id C0CE940019 for ; Mon, 23 May 2022 13:47:58 +0000 (UTC) Received: by mail-qk1-f172.google.com with SMTP id l82so8090149qke.3 for ; Mon, 23 May 2022 06:48:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=ZfWVPz+O1VSySrCT+nJSG/7hKIl6GIpKGGB50irRGQA=; b=A8VRN/EMueHRu0XxRCMtuHufuIu2Xm8zuoRzN5pJV3rGeIltR3PtAFLlmnPpR9bFFF jAvCjJvZtWz4dLPDWroIwahSTXPV9zQxpt0B+we0G0kbLOTm8KHB7dj53GZFe4pOwjd/ 77bz+c5y/fhEMSnWpdHcdQR/DruafQu6hJ5eSMR1LIfN5XIVabAx+4KAc3aqGdJERP5S u1GNfppyH429fW640VMhPID4qhIAIMcACyFafQBYX3KSi/PWR9oegBRov45gQZNREsr6 OXC+0QSjuKnj68Cc2YlsiXvutHUOK7+W/AriLftSQ4H0c7q0B/0KZlb1Ueorcf9w3AfK nfEQ== X-Gm-Message-State: AOAM531gQ6URw75gb9t4jDODBWZDqWe80n58T1obhv+tA+ao8/tvSfXr Gif34+xUq724uHZMzjW5G7o= X-Google-Smtp-Source: ABdhPJzRuT8KiH9S+tSHH3yTDcVglcx6KatfL3zJcjRfefdWiIC4BjibdZdsn/zp4XMQgHXguq28xw== X-Received: by 2002:a37:62cd:0:b0:6a3:4cbe:e74e with SMTP id w196-20020a3762cd000000b006a34cbee74emr9058442qkb.550.1653313706187; Mon, 23 May 2022 06:48:26 -0700 (PDT) Received: from dev0025.ash9.facebook.com (fwdproxy-ash-020.fbsv.net. [2a03:2880:20ff:14::face:b00c]) by smtp.gmail.com with ESMTPSA id t6-20020a05622a01c600b002f93aeaf770sm904648qtw.92.2022.05.23.06.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 May 2022 06:48:25 -0700 (PDT) Date: Mon, 23 May 2022 06:48:23 -0700 From: David Vernet To: Christophe JAILLET Cc: dan.carpenter@oracle.com, Johannes Weiner , Michal Hocko , Roman Gushchin , Shakeel Butt , Muchun Song , Tejun Heo , Zefan Li , Shuah Khan , Andrew Morton , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH] cgroup: Fix an error handling path in alloc_pagecache_max_30M() Message-ID: <20220523134823.lcbruwv5eodueoag@dev0025.ash9.facebook.com> References: <628312312eb40e0e39463a2c06415fde5295c716.1653229120.git.christophe.jaillet@wanadoo.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <628312312eb40e0e39463a2c06415fde5295c716.1653229120.git.christophe.jaillet@wanadoo.fr> User-Agent: NeoMutt/20211029 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: C0CE940019 X-Stat-Signature: 6zdntauqy9ket5y13oqyacr47o41d1ks Authentication-Results: imf17.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf17.hostedemail.com: domain of dcvernet@gmail.com designates 209.85.222.172 as permitted sender) smtp.mailfrom=dcvernet@gmail.com X-Rspam-User: X-HE-Tag: 1653313678-229990 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Sun, May 22, 2022 at 04:18:51PM +0200, Christophe JAILLET wrote: > If the first goto is taken, 'fd' is not opened yet (and is un-initialized). > So a direct return is safer. > > Fixes: c1a31a2f7a9c ("cgroup: fix racy check in alloc_pagecache_max_30M() helper function") > Signed-off-by: Christophe JAILLET > --- > tools/testing/selftests/cgroup/test_memcontrol.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c > index c3d0d5f7b19c..8833359556f3 100644 > --- a/tools/testing/selftests/cgroup/test_memcontrol.c > +++ b/tools/testing/selftests/cgroup/test_memcontrol.c > @@ -448,7 +448,7 @@ static int alloc_pagecache_max_30M(const char *cgroup, void *arg) > high = cg_read_long(cgroup, "memory.high"); > max = cg_read_long(cgroup, "memory.max"); > if (high != MB(30) && max != MB(30)) > - goto cleanup; > + return -1; > > fd = get_temp_fd(); > if (fd < 0) > -- > 2.34.1 > Acked-by: David Vernet