linux-sgx.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm: Optimizing error condition detection in do_mprotect_pkey()
@ 2021-01-18 13:33 Tianjia Zhang
  2021-01-20 14:29 ` Jarkko Sakkinen
  0 siblings, 1 reply; 4+ messages in thread
From: Tianjia Zhang @ 2021-01-18 13:33 UTC (permalink / raw)
  To: Jarkko Sakkinen, Thomas Gleixner, Ingo Molnar, Borislav Petkov,
	H. Peter Anvin, Andrew Morton, Shuah Khan, haitao.huang,
	Kai Huang, x86, linux-sgx, linux-kernel, linux-mm,
	linux-kselftest, Jia Zhang
  Cc: Tianjia Zhang

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 <zhang.jia@linux.alibaba.com>
Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
 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


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-01-22 17:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-18 13:33 [PATCH] mm: Optimizing error condition detection in do_mprotect_pkey() Tianjia Zhang
2021-01-20 14:29 ` Jarkko Sakkinen
2021-01-21 22:46   ` Andrew Morton
2021-01-22 17:38     ` Jarkko Sakkinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).