* [PATCH] powerpc/mm: Return directly after a failed __copy_from_user() in sys_subpage_prot()
@ 2017-01-21 15:24 SF Markus Elfring
2017-01-27 0:40 ` Michael Ellerman
0 siblings, 1 reply; 2+ messages in thread
From: SF Markus Elfring @ 2017-01-21 15:24 UTC (permalink / raw)
To: linuxppc-dev, Benjamin Herrenschmidt, Michael Ellerman,
Paul Mackerras
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 21 Jan 2017 16:10:50 +0100
* Return directly after a call of the function "__copy_from_user"
failed here.
This issue was detected by using the Coccinelle software.
* Delete the jump label "out2" which became unnecessary with
this refactoring.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
arch/powerpc/mm/subpage-prot.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/powerpc/mm/subpage-prot.c b/arch/powerpc/mm/subpage-prot.c
index d5543514c1df..40309edd7cb7 100644
--- a/arch/powerpc/mm/subpage-prot.c
+++ b/arch/powerpc/mm/subpage-prot.c
@@ -248,9 +248,8 @@ long sys_subpage_prot(unsigned long addr, unsigned long len, u32 __user *map)
nw = (next - addr) >> PAGE_SHIFT;
up_write(&mm->mmap_sem);
- err = -EFAULT;
if (__copy_from_user(spp, map, nw * sizeof(u32)))
- goto out2;
+ return -EFAULT;
map += nw;
down_write(&mm->mmap_sem);
@@ -262,6 +261,5 @@ long sys_subpage_prot(unsigned long addr, unsigned long len, u32 __user *map)
err = 0;
out:
up_write(&mm->mmap_sem);
- out2:
return err;
}
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: powerpc/mm: Return directly after a failed __copy_from_user() in sys_subpage_prot()
2017-01-21 15:24 [PATCH] powerpc/mm: Return directly after a failed __copy_from_user() in sys_subpage_prot() SF Markus Elfring
@ 2017-01-27 0:40 ` Michael Ellerman
0 siblings, 0 replies; 2+ messages in thread
From: Michael Ellerman @ 2017-01-27 0:40 UTC (permalink / raw)
To: SF Markus Elfring, linuxppc-dev, Benjamin Herrenschmidt,
Paul Mackerras
Cc: kernel-janitors, LKML
On Sat, 2017-01-21 at 15:24:58 UTC, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sat, 21 Jan 2017 16:10:50 +0100
>
> * Return directly after a call of the function "__copy_from_user"
> failed here.
>
> This issue was detected by using the Coccinelle software.
>
> * Delete the jump label "out2" which became unnecessary with
> this refactoring.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/a967f161abc7c4a6936ceb15737f75
cheers
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-27 0:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-21 15:24 [PATCH] powerpc/mm: Return directly after a failed __copy_from_user() in sys_subpage_prot() SF Markus Elfring
2017-01-27 0:40 ` Michael Ellerman
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).