Skip to content

Commit fa63895

Browse files
ramosian-glidergregkh
authored andcommitted
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>
1 parent b9ff317 commit fa63895

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

net/packet/af_packet.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3802,6 +3802,8 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
38023802
case PACKET_HDRLEN:
38033803
if (len > sizeof(int))
38043804
len = sizeof(int);
3805+
if (len < sizeof(int))
3806+
return -EINVAL;
38053807
if (copy_from_user(&val, optval, len))
38063808
return -EFAULT;
38073809
switch (val) {

0 commit comments

Comments
 (0)