diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-12-03 15:42:13 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-12-03 15:44:09 -0800 |
| commit | 55fd59b003f6e8fd88cf16590e79823d7ccf3026 (patch) | |
| tree | f23b2225f1a00b80632d612428708d5a57ad330b /net/x25/af_x25.c | |
| parent | a4390e966f952510808b10ce7ae2a7dd2a08c0e5 (diff) | |
| parent | bbe2ba04c5a92a49db8a42c850a5a2f6481e47eb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
drivers/net/ethernet/ibm/ibmvnic.c
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/x25/af_x25.c')
| -rw-r--r-- | net/x25/af_x25.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 9232cdb42ad9..d41fffb2507b 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -675,7 +675,8 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) int len, i, rc = 0; if (addr_len != sizeof(struct sockaddr_x25) || - addr->sx25_family != AF_X25) { + addr->sx25_family != AF_X25 || + strnlen(addr->sx25_addr.x25_addr, X25_ADDR_LEN) == X25_ADDR_LEN) { rc = -EINVAL; goto out; } @@ -769,7 +770,8 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, rc = -EINVAL; if (addr_len != sizeof(struct sockaddr_x25) || - addr->sx25_family != AF_X25) + addr->sx25_family != AF_X25 || + strnlen(addr->sx25_addr.x25_addr, X25_ADDR_LEN) == X25_ADDR_LEN) goto out; rc = -ENETUNREACH; |