diff mbox

[net-next] tcp: remove the duplicate prefixes in the logging message

Message ID 1398245335-18780-1-git-send-email-roy.qing.li@gmail.com
State Changes Requested, archived
Delegated to: David Miller
Headers show

Commit Message

Li RongQing April 23, 2014, 9:28 a.m. UTC
From: Li RongQing <roy.qing.li@gmail.com>

The current message is:
	TCP: TCP: Possible SYN flooding on port 80. Sending cookies. ...

The cause is that pr_info will implicitly print the pr_fmt string, which is standard
prefix, and explicitly print the "proto" which is "TCP:" too

it is unsuitable to not print proto, since proto maybe TCPv6, so use printk directly.

Cc: Joe Perches <joe@perches.com>
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
---
 net/ipv4/tcp_ipv4.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Daniel Borkmann April 23, 2014, 9:35 a.m. UTC | #1
On 04/23/2014 11:28 AM, roy.qing.li@gmail.com wrote:
> From: Li RongQing <roy.qing.li@gmail.com>
>
> The current message is:
> 	TCP: TCP: Possible SYN flooding on port 80. Sending cookies. ...
>
> The cause is that pr_info will implicitly print the pr_fmt string, which is standard
> prefix, and explicitly print the "proto" which is "TCP:" too
>
> it is unsuitable to not print proto, since proto maybe TCPv6, so use printk directly.

Can't you just leave the pr_info() instead, and reword that into something like:

   "Possible %s SYN flooding[...]", proto

> Cc: Joe Perches <joe@perches.com>
> Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
> ---
>   net/ipv4/tcp_ipv4.c |    4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> index 438f3b9..85ebe68 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -892,8 +892,8 @@ bool tcp_syn_flood_action(struct sock *sk,
>   	lopt = inet_csk(sk)->icsk_accept_queue.listen_opt;
>   	if (!lopt->synflood_warned && sysctl_tcp_syncookies != 2) {
>   		lopt->synflood_warned = 1;
> -		pr_info("%s: Possible SYN flooding on port %d. %s.  Check SNMP counters.\n",
> -			proto, ntohs(tcp_hdr(skb)->dest), msg);
> +		printk(KERN_INFO "%s: Possible SYN flooding on port %d. %s. Check SNMP counters.\n",
> +		       proto, ntohs(tcp_hdr(skb)->dest), msg);
>   	}
>   	return want_cookie;
>   }
>
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Li RongQing April 23, 2014, 1:32 p.m. UTC | #2
On Wed, Apr 23, 2014 at 5:35 PM, Daniel Borkmann <dborkman@redhat.com> wrote:
> On 04/23/2014 11:28 AM, roy.qing.li@gmail.com wrote:
>>
>> From: Li RongQing <roy.qing.li@gmail.com>
>>
>> The current message is:
>>         TCP: TCP: Possible SYN flooding on port 80. Sending cookies. ...
>>
>> The cause is that pr_info will implicitly print the pr_fmt string, which
>> is standard
>> prefix, and explicitly print the "proto" which is "TCP:" too
>>
>> it is unsuitable to not print proto, since proto maybe TCPv6, so use
>> printk directly.
>
>
> Can't you just leave the pr_info() instead, and reword that into something
> like:
>
>   "Possible %s SYN flooding[...]", proto
To ipv4:

TCP: Possible TCP SYN flooding on port 80. Sending cookies. ...

To ipv6:

TCP: Possible TCPv6 SYN flooding on port 80. Sending cookies. ...


I think there are two "TCP" still, and it is  duplicate;


-Roy
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller April 24, 2014, 5:26 p.m. UTC | #3
From: Li RongQing <roy.qing.li@gmail.com>
Date: Wed, 23 Apr 2014 21:32:43 +0800

> On Wed, Apr 23, 2014 at 5:35 PM, Daniel Borkmann <dborkman@redhat.com> wrote:
>> On 04/23/2014 11:28 AM, roy.qing.li@gmail.com wrote:
>>>
>>> From: Li RongQing <roy.qing.li@gmail.com>
>>>
>>> The current message is:
>>>         TCP: TCP: Possible SYN flooding on port 80. Sending cookies. ...
>>>
>>> The cause is that pr_info will implicitly print the pr_fmt string, which
>>> is standard
>>> prefix, and explicitly print the "proto" which is "TCP:" too
>>>
>>> it is unsuitable to not print proto, since proto maybe TCPv6, so use
>>> printk directly.
>>
>>
>> Can't you just leave the pr_info() instead, and reword that into something
>> like:
>>
>>   "Possible %s SYN flooding[...]", proto
> To ipv4:
> 
> TCP: Possible TCP SYN flooding on port 80. Sending cookies. ...
> 
> To ipv6:
> 
> TCP: Possible TCPv6 SYN flooding on port 80. Sending cookies. ...
> 
> 
> I think there are two "TCP" still, and it is  duplicate;

Just kill the proto string altogether, I don't think it doesn't adds
anything.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 438f3b9..85ebe68 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -892,8 +892,8 @@  bool tcp_syn_flood_action(struct sock *sk,
 	lopt = inet_csk(sk)->icsk_accept_queue.listen_opt;
 	if (!lopt->synflood_warned && sysctl_tcp_syncookies != 2) {
 		lopt->synflood_warned = 1;
-		pr_info("%s: Possible SYN flooding on port %d. %s.  Check SNMP counters.\n",
-			proto, ntohs(tcp_hdr(skb)->dest), msg);
+		printk(KERN_INFO "%s: Possible SYN flooding on port %d. %s. Check SNMP counters.\n",
+		       proto, ntohs(tcp_hdr(skb)->dest), msg);
 	}
 	return want_cookie;
 }