diff options
author | maximilian attems <max@stro.at> | 2008-01-28 23:44:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-31 22:27:06 -0500 |
commit | 1987e7b4855fcb6a866d3279ee9f2890491bc34d (patch) | |
tree | ead27b6055eadc76cb58c3ebd0b12b53c2fc12dd /net/ax25 | |
parent | a44562e4d3a1612858a7872d633fce8c0ab349ab (diff) |
[AX25]: Kill ax25_bind() user triggable printk.
on the last run overlooked that sfuzz triggable message.
move the message to the corresponding comment.
Signed-off-by: maximilian attems <max@stro.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ax25')
-rw-r--r-- | net/ax25/af_ax25.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 1bc0e85f04a5..8fc64e3150a2 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
@@ -1037,16 +1037,13 @@ static int ax25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) | |||
1037 | int err = 0; | 1037 | int err = 0; |
1038 | 1038 | ||
1039 | if (addr_len != sizeof(struct sockaddr_ax25) && | 1039 | if (addr_len != sizeof(struct sockaddr_ax25) && |
1040 | addr_len != sizeof(struct full_sockaddr_ax25)) { | 1040 | addr_len != sizeof(struct full_sockaddr_ax25)) |
1041 | /* support for old structure may go away some time */ | 1041 | /* support for old structure may go away some time |
1042 | * ax25_bind(): uses old (6 digipeater) socket structure. | ||
1043 | */ | ||
1042 | if ((addr_len < sizeof(struct sockaddr_ax25) + sizeof(ax25_address) * 6) || | 1044 | if ((addr_len < sizeof(struct sockaddr_ax25) + sizeof(ax25_address) * 6) || |
1043 | (addr_len > sizeof(struct full_sockaddr_ax25))) { | 1045 | (addr_len > sizeof(struct full_sockaddr_ax25))) |
1044 | return -EINVAL; | 1046 | return -EINVAL; |
1045 | } | ||
1046 | |||
1047 | printk(KERN_WARNING "ax25_bind(): %s uses old (6 digipeater) socket structure.\n", | ||
1048 | current->comm); | ||
1049 | } | ||
1050 | 1047 | ||
1051 | if (addr->fsa_ax25.sax25_family != AF_AX25) | 1048 | if (addr->fsa_ax25.sax25_family != AF_AX25) |
1052 | return -EINVAL; | 1049 | return -EINVAL; |