summaryrefslogtreecommitdiffstats
path: root/net/ax25
diff options
context:
space:
mode:
authormaximilian attems <max@stro.at>2008-01-28 20:44:11 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-31 19:27:06 -0800
commit1987e7b4855fcb6a866d3279ee9f2890491bc34d (patch)
treeead27b6055eadc76cb58c3ebd0b12b53c2fc12dd /net/ax25
parenta44562e4d3a1612858a7872d633fce8c0ab349ab (diff)
downloadlinux-1987e7b4855fcb6a866d3279ee9f2890491bc34d.tar.bz2
[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.c13
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)
int err = 0;
if (addr_len != sizeof(struct sockaddr_ax25) &&
- addr_len != sizeof(struct full_sockaddr_ax25)) {
- /* support for old structure may go away some time */
+ addr_len != sizeof(struct full_sockaddr_ax25))
+ /* support for old structure may go away some time
+ * ax25_bind(): uses old (6 digipeater) socket structure.
+ */
if ((addr_len < sizeof(struct sockaddr_ax25) + sizeof(ax25_address) * 6) ||
- (addr_len > sizeof(struct full_sockaddr_ax25))) {
+ (addr_len > sizeof(struct full_sockaddr_ax25)))
return -EINVAL;
- }
-
- printk(KERN_WARNING "ax25_bind(): %s uses old (6 digipeater) socket structure.\n",
- current->comm);
- }
if (addr->fsa_ax25.sax25_family != AF_AX25)
return -EINVAL;