Skip to contentSkip to conversation

Patch "kcm: return immediately after copy_from_user() failure" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Apr 29, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

kcm: return immediately after copy_from_user() failure

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
kcm-return-immediately-after-copy_from_user-failure.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Sat Apr 29 08:22:40 CEST 2017

From: WANG Cong <[email protected]>
Date: Thu, 23 Mar 2017 11:03:31 -0700
Subject: kcm: return immediately after copy_from_user() failure

From: WANG Cong <[email protected]>

[ Upstream commit a80db69e47d764bbcaf2fec54b1f308925e7c490 ]

There is no reason to continue after a copy_from_user() failure.

Fixes ab7ac4eb9832 ("kcm: Kernel Connection Multiplexor module")
Cc Tom Herbert <[email protected]>
---
 net/kcm/kcmsock.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
net/kcm/kcmsock.c +3 -3
@@ -1685,7 +1685,7 @@ static int kcm_ioctl(struct socket *sock
 		struct kcm_attach info;
 
 		if (copy_from_user(&info, (void __user *)arg, sizeof(info)))
-			err = -EFAULT;
+			return -EFAULT;
 
 		err = kcm_attach_ioctl(sock, &info);
 
@@ -1695,7 +1695,7 @@ static int kcm_ioctl(struct socket *sock
 		struct kcm_unattach info;
 
 		if (copy_from_user(&info, (void __user *)arg, sizeof(info)))
-			err = -EFAULT;
+			return -EFAULT;
 
 		err = kcm_unattach_ioctl(sock, &info);
 
@@ -1706,7 +1706,7 @@ static int kcm_ioctl(struct socket *sock
 		struct socket *newsock = NULL;
 
 		if (copy_from_user(&info, (void __user *)arg, sizeof(info)))
-			err = -EFAULT;
+			return -EFAULT;
 
 		err = kcm_clone(sock, &info, &newsock);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/ipv6-check-skb-protocol-before-lookup-for-nexthop.patch queue-4.10/kcm-return-immediately-after-copy_from_user-failure.patch