Commit a9288525 authored by andrew hendry's avatar andrew hendry Committed by David S. Miller
Browse files

X25: Dont let x25_bind use addresses containing characters 



Addresses should be all digits.
Stops x25_bind using addresses containing characters.

Signed-off-by: default avatarAndrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b18e7a06

net/x25/af_x25.c

+10 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include <linux/notifier.h>

#include <linux/init.h>

#include <linux/compat.h>

#include <linux/ctype.h>



#include <net/x25.h>

#include <net/compat.h>
@@ -648,7 +649,7 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
{

	struct sock *sk = sock->sk;

	struct sockaddr_x25 *addr = (struct sockaddr_x25 *)uaddr;

	int rc = 0;

	int len, i, rc = 0;



	lock_kernel();

	if (!sock_flag(sk, SOCK_ZAPPED) ||
@@ -658,6 +659,14 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 
		goto out;

	}



	len = strlen(addr->sx25_addr.x25_addr);

	for (i = 0; i < len; i++) {

		if (!isdigit(addr->sx25_addr.x25_addr[i])) {

			rc = -EINVAL;

			goto out;

		}

	}



	x25_sk(sk)->source_addr = addr->sx25_addr;

	x25_insert_socket(sk);

	sock_reset_flag(sk, SOCK_ZAPPED);