Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbbb384f authored by Alexander Potapenko's avatar Alexander Potapenko Committed by Greg Kroah-Hartman
Browse files

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: default avatarAlexander Potapenko <glider@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1728786b

net/packet/af_packet.c

+2 −0
Original line number Diff line number Diff line
@@ -3482,6 +3482,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) {