mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <sasha.levin@oracle.com>
To: kuznet@ms2.inr.ac.ru, davem@davemloft.net, jmorris@namei.org,
	yoshfuji@linux-ipv6.org, kaber@trash.net
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
	Sasha Levin <sasha.levin@oracle.com>
Subject: [PATCH] net: ipv4: raw: don't agree to 0 sized headers
Date: Wed, 30 Jul 2014 09:21:08 -0400	[thread overview]
Message-ID: <1406726468-19035-1-git-send-email-sasha.levin@oracle.com> (raw)

For raw sockets, we'd always assume that a header is supplied and will attempt
to copy it into the ip header space using memcpy_fromiovecend():

	if (memcpy_fromiovecend((void *)iph, from, 0, length))
		goto error_free;

The problem is that memcpy_fromiovecend() assumes that there are actual data
to read from the iovec and doesn't deal with cases where there are none:

	int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,
				int offset, int len)
	{
		/* Skip over the finished iovecs */
		while (offset >= iov->iov_len) {
			offset -= iov->iov_len;
			iov++;
		}
		[...]

So when offset == 0 and iov->iov_len == 0, we'll just run iov into random
kernel memory until it hits something bad and dies in a BUG/panic - either
killing the kernel or leaking memory and held locks.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
---
 net/ipv4/raw.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 739db31..3af59ee 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -345,6 +345,10 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4,
 			       rt->dst.dev->mtu);
 		return -EMSGSIZE;
 	}
+
+	if (length == 0)
+		return -EINVAL;
+
 	if (flags&MSG_PROBE)
 		goto out;
 
-- 
1.7.10.4


             reply	other threads:[~2014-07-30 13:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-30 13:21 Sasha Levin [this message]
2014-07-31 19:24 ` David Miller

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=1406726468-19035-1-git-send-email-sasha.levin@oracle.com \
    --to=sasha.levin@oracle.com \
    --cc=davem@davemloft.net \
    --cc=jmorris@namei.org \
    --cc=kaber@trash.net \
    --cc=kuznet@ms2.inr.ac.ru \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=yoshfuji@linux-ipv6.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

all inboxes | Powered by JetHome®