diff options
| author | andrew hendry <andrew.hendry@gmail.com> | 2010-02-14 02:00:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-15 21:49:52 -0800 |
| commit | a9288525d2aed806c1b8a785c226d4a9e6371650 (patch) | |
| tree | 5de6722a6dfc60e603caa9631609d379b6547a1e | |
| parent | b18e7a06857833d2c7c8c8457e5a3a7c3327f643 (diff) | |
| download | linux-a9288525d2aed806c1b8a785c226d4a9e6371650.tar.bz2 | |
X25: Dont let x25_bind use addresses containing characters
Addresses should be all digits.
Stops x25_bind using addresses containing characters.
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/x25/af_x25.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 6c7104edec60..9796f3ed1edb 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -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); |