stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <gregkh@linuxfoundation.org>
To: andreyknvl@google.com, davem@davemloft.net, edumazet@google.com,
	gregkh@linuxfoundation.org
Cc: <stable@vger.kernel.org>, <stable-commits@vger.kernel.org>
Subject: Patch "net/packet: fix overflow in check for tp_reserve" has been added to the 4.10-stable tree
Date: Sat, 29 Apr 2017 08:23:24 +0200	[thread overview]
Message-ID: <149344700473100@kroah.com> (raw)


This is a note to let you know that I've just added the patch titled

    net/packet: fix overflow in check for tp_reserve

to the 4.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     net-packet-fix-overflow-in-check-for-tp_reserve.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Sat Apr 29 08:22:40 CEST 2017
From: Andrey Konovalov <andreyknvl@google.com>
Date: Wed, 29 Mar 2017 16:11:22 +0200
Subject: net/packet: fix overflow in check for tp_reserve

From: Andrey Konovalov <andreyknvl@google.com>


[ Upstream commit bcc5364bdcfe131e6379363f089e7b4108d35b70 ]

When calculating po->tp_hdrlen + po->tp_reserve the result can overflow.

Fix by checking that tp_reserve <= INT_MAX on assign.

Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 net/packet/af_packet.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3644,6 +3644,8 @@ packet_setsockopt(struct socket *sock, i
 			return -EBUSY;
 		if (copy_from_user(&val, optval, sizeof(val)))
 			return -EFAULT;
+		if (val > INT_MAX)
+			return -EINVAL;
 		po->tp_reserve = val;
 		return 0;
 	}


Patches currently in stable-queue which might be from andreyknvl@google.com are

queue-4.10/ipv6-check-skb-protocol-before-lookup-for-nexthop.patch
queue-4.10/ping-implement-proper-locking.patch
queue-4.10/net-timestamp-avoid-use-after-free-in-ip_recv_error.patch
queue-4.10/sctp-listen-on-the-sock-only-when-it-s-state-is-listening-or-closed.patch
queue-4.10/net-ipv6-regenerate-host-route-if-moved-to-gc-list.patch
queue-4.10/net-ipv6-rtf_pcpu-should-not-be-settable-from-userspace.patch
queue-4.10/ipv6-sr-fix-out-of-bounds-access-in-srh-validation.patch
queue-4.10/net-packet-fix-overflow-in-check-for-tp_frame_nr.patch
queue-4.10/net-packet-fix-overflow-in-check-for-tp_reserve.patch
queue-4.10/tcp-memset-ca_priv-data-to-0-properly.patch
queue-4.10/ip6mr-fix-notification-device-destruction.patch

                 reply	other threads:[~2017-04-29  6:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=149344700473100@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=andreyknvl@google.com \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=stable-commits@vger.kernel.org \
    --cc=stable@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).