Skip to content

Commit 2f2a7ff

Browse files
peilin-yedavem330
authored andcommitted
AX.25: Fix out-of-bounds read in ax25_connect()
Checks on `addr_len` and `fsa->fsa_ax25.sax25_ndigis` are insufficient. ax25_connect() can go out of bounds when `fsa->fsa_ax25.sax25_ndigis` equals to 7 or 8. Fix it. This issue has been reported as a KMSAN uninit-value bug, because in such a case, ax25_connect() reaches into the uninitialized portion of the `struct sockaddr_storage` statically allocated in __sys_connect(). It is safe to remove `fsa->fsa_ax25.sax25_ndigis > AX25_MAX_DIGIS` because `addr_len` is guaranteed to be less than or equal to `sizeof(struct full_sockaddr_ax25)`. Reported-by: [email protected] Link: https://syzkaller.appspot.com/bug?id=55ef9d629f3b3d7d70b69558015b63b48d01af66 Signed-off-by: Peilin Ye <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 26cb708 commit 2f2a7ff

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

net/ax25/af_ax25.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1187,7 +1187,9 @@ static int __must_check ax25_connect(struct socket *sock,
11871187
if (addr_len > sizeof(struct sockaddr_ax25) &&
11881188
fsa->fsa_ax25.sax25_ndigis != 0) {
11891189
/* Valid number of digipeaters ? */
1190-
if (fsa->fsa_ax25.sax25_ndigis < 1 || fsa->fsa_ax25.sax25_ndigis > AX25_MAX_DIGIS) {
1190+
if (fsa->fsa_ax25.sax25_ndigis < 1 ||
1191+
addr_len < sizeof(struct sockaddr_ax25) +
1192+
sizeof(ax25_address) * fsa->fsa_ax25.sax25_ndigis) {
11911193
err = -EINVAL;
11921194
goto out_release;
11931195
}

0 commit comments

Comments
 (0)