]> git.baikalelectronics.ru Git - kernel.git/commit
net/x25: prevent a couple of overflows
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 1 Dec 2020 15:15:12 +0000 (18:15 +0300)
committerJakub Kicinski <kuba@kernel.org>
Thu, 3 Dec 2020 01:26:36 +0000 (17:26 -0800)
commit211d3b6de40981ad6f7e66198fafc7db78c2f2cc
treef4c7d9a7f7cf6314c4bce4ba346cd5f91ff95000
parent2a2bad6fc18118493e386b84988a7a8bf878b6d1
net/x25: prevent a couple of overflows

The .x25_addr[] address comes from the user and is not necessarily
NUL terminated.  This leads to a couple problems.  The first problem is
that the strlen() in x25_bind() can read beyond the end of the buffer.

The second problem is more subtle and could result in memory corruption.
The call tree is:
  x25_connect()
  --> x25_write_internal()
      --> x25_addr_aton()

The .x25_addr[] buffers are copied to the "addresses" buffer from
x25_write_internal() so it will lead to stack corruption.

Verify that the strings are NUL terminated and return -EINVAL if they
are not.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Fixes: 6be342c59b28 ("X25: Dont let x25_bind use addresses containing characters")
Reported-by: "kiyin(尹亮)" <kiyin@tencent.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Martin Schiller <ms@dev.tdt.de>
Link: https://lore.kernel.org/r/X8ZeAKm8FnFpN//B@mwanda
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/x25/af_x25.c