netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: davej@redhat.com
Cc: netdev@vger.kernel.org
Subject: Re: return 0 when MSG_OOB in ping_recvmsg
Date: Tue, 21 Feb 2012 17:59:39 -0500 (EST)	[thread overview]
Message-ID: <20120221.175939.31025047537106310.davem@davemloft.net> (raw)
In-Reply-To: <20120221225058.GA15387@redhat.com>

From: Dave Jones <davej@redhat.com>
Date: Tue, 21 Feb 2012 17:50:59 -0500

> 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.
> 
> Signed-off-by: Dave Jones <davej@redhat.com>

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.

Reported-by: Dave Jones <davej@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/ipv4/ping.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index aea5a19..b072386 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -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;
 
-- 
1.7.7.6

      reply	other threads:[~2012-02-21 22:59 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-21 22:50 return 0 when MSG_OOB in ping_recvmsg Dave Jones
2012-02-21 22:59 ` David Miller [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120221.175939.31025047537106310.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=davej@redhat.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).