Skip to contentSkip to conversation

AX25: nuke user trigable printks

PATCH In review maximilian attems 2 participants 3 messages Jan 7, 2008 – Jan 8, 2008

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

maximilian attems

author
#0 lore raw

PATCH 1/1 AX25: nuke user trigable printks

sfuzz trigerrs any of those printk easily. things that should have gone in early 2.5.x aka years ago should not be thrown so easily to the user.

Signed-off-by maximilian attems <[email protected]>
---
 net/ax25/af_ax25.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)
net/ax25/af_ax25.c +3 -12
index 8378afd..62ab6bd 100644
@@ -1111,18 +1111,13 @@ static int __must_check ax25_connect(struct socket *sock,
 
 	if (addr_len == sizeof(struct sockaddr_ax25)) {
 		/* support for this will go away in early 2.5.x */
-		printk(KERN_WARNING "ax25_connect(): %s uses obsolete socket structure\n",
-			current->comm);
+		;
 	}
 	else if (addr_len != sizeof(struct full_sockaddr_ax25)) {
 		/* support for old structure may go away some time */
 		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_connect(): %s uses old (6 digipeater) socket structure.\n",
-			current->comm);
 	}
 
 	if (fsa->fsa_ax25.sax25_family != AF_AX25)

@@ -1468,8 +1463,7 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock,
 		}
 
 		if (addr_len == sizeof(struct sockaddr_ax25)) {
-			printk(KERN_WARNING "ax25_sendmsg(): %s uses obsolete socket structure\n",
-				current->comm);
+			;
 		}
 		else if (addr_len != sizeof(struct full_sockaddr_ax25)) {
 			/* support for old structure may go away some time */

@@ -1478,9 +1472,6 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock,
 				err = -EINVAL;
 				goto out;
 			}
-
-			printk(KERN_WARNING "ax25_sendmsg(): %s uses old (6 digipeater) socket structure.\n",
-				current->comm);
 		}
 
 		if (addr_len > sizeof(struct sockaddr_ax25) && usax->sax25_ndigis != 0) {
Signature · 1 line
debian.1.5.3.7.1-dirty
maintainer
#1 lore raw

From: maximilian attems <[email protected]>
Date: Mon, 7 Jan 2008 18:55:13 +0100

Quoted 5 lines

sfuzz trigerrs any of those printk easily. things that should have gone in early 2.5.x aka years ago should not be thrown so easily to the user.

Signed-off-by maximilian attems <[email protected]>

Can you replace the printk()'s with comments at least?

Otherwise nobody is going to remember what we were trying to accomplish here and it will guarentee that, in fact, support for these old things will never get removed.

At least if comments are there, someone might think to add these things to the feature removal schedule and follow through with it.

Thanks.

author
#2 lore raw
Quoted 10 lines · David Miller

Can you replace the printk()'s with comments at least?

Otherwise nobody is going to remember what we were trying to accomplish here and it will guarentee that, in fact, support for these old things will never get removed.

At least if comments are there, someone might think to add these things to the feature removal schedule and follow through with it.

sure will resend later.
wasn't sure myself of the chosen minimal user visible clean up.

thanks

Signature · 1 line
maks