[PATCH review for 4.4 32/47] net/packet: check length in getsockopt() called with PACKET_HDRLEN

From	"Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
Newsgroups	linux.kernel
Subject	[PATCH review for 4.4 32/47] net/packet: check length in getsockopt() called with PACKET_HDRLEN
Date	2017-09-20 07:00 +0200
Message-ID	<urFha-6BI-79@gated-at.bofh.it> (permalink)
References	<urF7r-6xD-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Alexander Potapenko <glider@google.com>

[ 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>
---
 net/packet/af_packet.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 148ec130d99d..b70055fc30cb 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3802,6 +3802,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) {
-- 
2.11.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH review for 4.4 32/47] net/packet: check length in getsockopt()  called with PACKET_HDRLEN "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com> - 2017-09-20 07:00 +0200

csiph-web