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 X-Spam-Level: X-Spam-Status: No, score=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4032BC433E0 for ; Wed, 20 Jan 2021 14:29:29 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D6E5223356 for ; Wed, 20 Jan 2021 14:29:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6E5223356 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 6FD506B0007; Wed, 20 Jan 2021 09:29:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AD506B0008; Wed, 20 Jan 2021 09:29:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 59D5F6B000D; Wed, 20 Jan 2021 09:29:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0241.hostedemail.com [216.40.44.241]) by kanga.kvack.org (Postfix) with ESMTP id 423EA6B0007 for ; Wed, 20 Jan 2021 09:29:28 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id DE1C9362E for ; Wed, 20 Jan 2021 14:29:27 +0000 (UTC) X-FDA: 77726386374.15.sand38_4b01cdd2755b Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id B3FFA1814B0C7 for ; Wed, 20 Jan 2021 14:29:27 +0000 (UTC) X-HE-Tag: sand38_4b01cdd2755b X-Filterd-Recvd-Size: 2988 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf12.hostedemail.com (Postfix) with ESMTP for ; Wed, 20 Jan 2021 14:29:27 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 8685E23329; Wed, 20 Jan 2021 14:29:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611152966; bh=JHHd5XKXRsuaWfamSWN2tPvthY11GXk7QS21FxFrvdg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=qztC3BI2X5X6WkB/wDGbA0u3PZ8r4+j+741azXlQHQxOIjUV8Tfv/1HuSuSw/rSXh LzkyEsv2Mkals4Xn8UpHYsAm7yZd27wk/nb1NEadNdBGSj/NxOj2SajfYS1IauzIGd TW2bIZR37X1v0OI7pekCjusxa2mC4cyMKwJo42+eEdCuKWsCJeE68RlIlF1n2cwz1r R5SswsxU3pXQ6h515wzphxcNZqRnO/UJe03Vdhtndx87n04bf2P7IpoQer88QbC4dr czZwgSMU1pHMU0qTvIw2qK9kYvDAzSieTa+hicKWmiVQwt1XNzigzsE40KKVX5Cenz 2OJ1dYFFLe6Kw== Date: Wed, 20 Jan 2021 16:29:20 +0200 From: Jarkko Sakkinen To: Tianjia Zhang Cc: Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Andrew Morton , Shuah Khan , haitao.huang@intel.com, Kai Huang , x86@kernel.org, linux-sgx@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Jia Zhang Subject: Re: [PATCH] mm: Optimizing error condition detection in do_mprotect_pkey() Message-ID: References: <20210118133310.98375-1-tianjia.zhang@linux.alibaba.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210118133310.98375-1-tianjia.zhang@linux.alibaba.com> 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 Mon, Jan 18, 2021 at 09:33:10PM +0800, Tianjia Zhang wrote: > Obviously, the error variable detection of the if statement is > for the mprotect callback function, so it is also put into the > scope of calling callbck. > > Reported-by: Jia Zhang > Signed-off-by: Tianjia Zhang No fixes tag, no description what this commit does. Nothing makes sense to me. /Jarkko > --- > mm/mprotect.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/mm/mprotect.c b/mm/mprotect.c > index ab709023e9aa..94188df1ee55 100644 > --- a/mm/mprotect.c > +++ b/mm/mprotect.c > @@ -617,10 +617,11 @@ static int do_mprotect_pkey(unsigned long start, size_t len, > if (tmp > end) > tmp = end; > > - if (vma->vm_ops && vma->vm_ops->mprotect) > + if (vma->vm_ops && vma->vm_ops->mprotect) { > error = vma->vm_ops->mprotect(vma, nstart, tmp, newflags); > - if (error) > - goto out; > + if (error) > + goto out; > + } > > error = mprotect_fixup(vma, &prev, nstart, tmp, newflags); > if (error) > -- > 2.19.1.3.ge56e4f7 > >