Skip to contentSkip to conversation

return 0 when MSG_OOB in ping_recvmsg

PATCH Dave Jones 2 participants 2 messages Feb 21, 2012

Subsystems (2)
lore
Share & tools
lore

Dave Jones

author
#0 lore raw

If a packet causes the 'if (flags & MSG_OOB)' test this function does first thing is true, it returns an uninitialised variable from the stack.

There may be a better return code for this failure, but returning '0 bytes copied' seems better than just returning garbage.

net/ipv4/ping.c +1 -1
index aea5a19..0823562 100644
@@ -626,7 +626,7 @@ static int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 	struct inet_sock *isk = inet_sk(sk);
 	struct sockaddr_in *sin = (struct sockaddr_in *)msg->msg_name;
 	struct sk_buff *skb;
-	int copied, err;
+	int copied, err = 0;
 
 	pr_debug("ping_recvmsg(sk=%p,sk->num=%u)\n", isk, isk->inet_num);
 
maintainer
#1 lore raw

From: Dave Jones <[email protected]>
Date: Tue, 21 Feb 2012 17:50:59 -0500

Quoted 7 lines

If a packet causes the 'if (flags & MSG_OOB)' test this function does first thing is true, it returns an uninitialised variable from the stack.

There may be a better return code for this failure, but returning '0 bytes copied' seems better than just returning garbage.

It should return something initialized, for sure, but more appropriate is -EOPNOTSUPP as is consistent with this file's sendsmg() implementation as well as the sendmsg and recvmsg methods from net/ipv4/raw.c upon which these were modelled.

So that's the change I'll commit, thanks Dave!

--------------------
ipv4: ping: Fix recvmsg MSG_OOB error handling.

Don't return an uninitialized variable as the error, return -EOPNOTSUPP instead.

---
 net/ipv4/ping.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
net/ipv4/ping.c +1 -0
index aea5a19..b072386 100644
@@ -630,6 +630,7 @@ static int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
 	pr_debug("ping_recvmsg(sk=%p,sk->num=%u)\n", isk, isk->inet_num);
 
+	err = -EOPNOTSUPP;
 	if (flags & MSG_OOB)
 		goto out;
 
Signature · 1 line
1.7.7.6