+ mm-optimizing-error-condition-detection-in-do_mprotect_pkey.patch added to -mm tree

+ mm-optimizing-error-condition-detection-in-do_mprotect_pkey.patch added to -mm tree

[akpm]

The patch titled
     Subject: mm/mprotect.c: optimize error detection in do_mprotect_pkey()
has been added to the -mm tree.  Its filename is
     mm-optimizing-error-condition-detection-in-do_mprotect_pkey.patch

This patch should soon appear at
    https://ozlabs.org/~akpm/mmots/broken-out/mm-optimizing-error-condition-detection-in-do_mprotect_pkey.patch
and later at
    https://ozlabs.org/~akpm/mmotm/broken-out/mm-optimizing-error-condition-detection-in-do_mprotect_pkey.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Subject: mm/mprotect.c: optimize error detection in do_mprotect_pkey()

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.

Link: https://lkml.kernel.org/r/20210118133310.98375-1-tianjia.zhang@linux.alibaba.com
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Reported-by: Jia Zhang <zhang.jia@linux.alibaba.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/mprotect.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- a/mm/mprotect.c~mm-optimizing-error-condition-detection-in-do_mprotect_pkey
+++ a/mm/mprotect.c
@@ -617,10 +617,11 @@ static int do_mprotect_pkey(unsigned lon
 		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)
_

Patches currently in -mm which might be from tianjia.zhang@linux.alibaba.com are

mm-optimizing-error-condition-detection-in-do_mprotect_pkey.patch