Skip to contentSkip to conversation

net: sendmsg: fix failed backport of "fix NULL pointer dereference"

PATCH In review Willy Tarreau 1 participant 1 message Dec 6, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/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 <[email protected]>

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 <[email protected]>
Cc Luis Henriques <[email protected]>
---
 net/compat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/compat.c +1 -1
index 71ed839..a5848ac 100644
@@ -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,
Signature · 1 line
1.7.12.2.21.g234cd45.dirty