From: Alexander Potapenko <glider@google.com>
Date: Tue, 25 Apr 2017 16:51:46 +0000 (+0200)
Subject: net/packet: check length in getsockopt() called with PACKET_HDRLEN
X-Git-Tag: archive/raspbian/4.9.80-2+rpi1~7^2~1827
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=897e8c528529f5b53d1a63bbac3802adf5e09170;p=linux-4.9.git

net/packet: check length in getsockopt() called with PACKET_HDRLEN


[ Upstream commit fd2c83b35752f0a8236b976978ad4658df14a59f ]

In the case getsockopt() is called with PACKET_HDRLEN and optlen < 4
|val| remains uninitialized and the syscall may behave differently
depending on its value, and even copy garbage to userspace on certain
architectures. To fix this we now return -EINVAL if optlen is too small.

This bug has been detected with KMSAN.

Signed-off-by: Alexander Potapenko <glider@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 35ba4b60d927..9c92c6cb6a4f 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3884,6 +3884,8 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 	case PACKET_HDRLEN:
 		if (len > sizeof(int))
 			len = sizeof(int);
+		if (len < sizeof(int))
+			return -EINVAL;
 		if (copy_from_user(&val, optval, len))
 			return -EFAULT;
 		switch (val) {