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=unavailable 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 E3611C433E9 for ; Wed, 20 Jan 2021 14:37:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AACF2221FF for ; Wed, 20 Jan 2021 14:37:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390726AbhATOgX (ORCPT ); Wed, 20 Jan 2021 09:36:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:40460 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389307AbhATOaG (ORCPT ); Wed, 20 Jan 2021 09:30:06 -0500 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> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > >