소스 검색

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

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>
Alexander Potapenko 8 년 전
부모
커밋
fd2c83b357
1개의 변경된 파일2개의 추가작업 그리고 0개의 파일을 삭제
  1. 2 0
      net/packet/af_packet.c

+ 2 - 0
net/packet/af_packet.c

@@ -3836,6 +3836,8 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
 	case PACKET_HDRLEN:
 	case PACKET_HDRLEN:
 		if (len > sizeof(int))
 		if (len > sizeof(int))
 			len = sizeof(int);
 			len = sizeof(int);
+		if (len < sizeof(int))
+			return -EINVAL;
 		if (copy_from_user(&val, optval, len))
 		if (copy_from_user(&val, optval, len))
 			return -EFAULT;
 			return -EFAULT;
 		switch (val) {
 		switch (val) {