diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-15 09:29:22 +0100 |
| commit | caa70ccf8cc719acb0540b558b4e075796778db8 (patch) | |
| tree | e8173307b04eca62168415be04e7800bdf011f80 /net/irda/irnet/irnet_ppp.c | |
| parent | 56d667f87e81d15d43f264007322f1179ce1722e (diff) | |
| parent | 3ec10cd8b526c6b10170c2649002672ee2019e73 (diff) | |
Merge branch 'linux-linaro-2.6.38-master' into for-ubuntuu2
Diffstat (limited to 'net/irda/irnet/irnet_ppp.c')
| -rw-r--r-- | net/irda/irnet/irnet_ppp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/irda/irnet/irnet_ppp.c b/net/irda/irnet/irnet_ppp.c index 7c567b8aa89..2bb2beb6a37 100644 --- a/net/irda/irnet/irnet_ppp.c +++ b/net/irda/irnet/irnet_ppp.c @@ -105,6 +105,9 @@ irnet_ctrl_write(irnet_socket * ap, while(isspace(start[length - 1])) length--; + DABORT(length < 5 || length > NICKNAME_MAX_LEN + 5, + -EINVAL, CTRL_ERROR, "Invalid nickname.\n"); + /* Copy the name for later reuse */ memcpy(ap->rname, start + 5, length - 5); ap->rname[length - 5] = '\0'; |