[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <2a26e912d2438674771c36169c190830@local>
Date: Sat, 06 Dec 2014 18:41:49 +0100
From: Willy Tarreau <w@....eu>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: Andrey Ryabinin <a.ryabinin@...sung.com>,
Luis Henriques <luis.henriques@...onical.com>,
Willy Tarreau <w@....eu>
Subject: [ 01/25] net: sendmsg: fix failed backport of "fix NULL pointer
dereference"
2.6.32-longterm review patch. If anyone has any objections, please let me know.
------------------
From: Willy Tarreau <w@....eu>
Luis Henriques reported that while backporting commit 40eea80 ("net:
sendmsg: fix NULL pointer dereference") and applying the diff by hand,
I made a typo resulting in the same test being done twice, and msg_name
not being tested.
This fixes cf90357 ("net: sendmsg: fix NULL pointer dereference")
which was merged into 2.6.32.64.
Cc: Andrey Ryabinin <a.ryabinin@...sung.com>
Cc: Luis Henriques <luis.henriques@...onical.com>
Signed-off-by: Willy Tarreau <w@....eu>
---
net/compat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/compat.c b/net/compat.c
index 71ed839..a5848ac 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -83,7 +83,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
{
int tot_len;
- if (kern_msg->msg_namelen && kern_msg->msg_namelen) {
+ if (kern_msg->msg_name && kern_msg->msg_namelen) {
if (mode==VERIFY_READ) {
int err = move_addr_to_kernel(kern_msg->msg_name,
kern_msg->msg_namelen,
--
1.7.12.2.21.g234cd45.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists