linux-kernel - Re: [PATCH v2 net-next 1/8] net: socket: intrudoce SKB_DROP_REASON_SOCKET

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <2512e358-f4d8-f85e-2a82-fbd5a97d1c2f@gmail.com>
Date:   Thu, 27 Jan 2022 08:37:06 -0700
From:   David Ahern <dsahern@...il.com>
To:     menglong8.dong@...il.com, dsahern@...nel.org, kuba@...nel.org
Cc:     rostedt@...dmis.org, mingo@...hat.com, davem@...emloft.net,
        yoshfuji@...ux-ipv6.org, edumazet@...gle.com, pablo@...filter.org,
        kadlec@...filter.org, fw@...len.de, imagedong@...cent.com,
        alobakin@...me, pabeni@...hat.com, cong.wang@...edance.com,
        talalahmad@...gle.com, haokexin@...il.com, keescook@...omium.org,
        memxor@...il.com, linux-kernel@...r.kernel.org,
        netdev@...r.kernel.org, netfilter-devel@...r.kernel.org,
        coreteam@...filter.org, mengensun@...cent.com
Subject: Re: [PATCH v2 net-next 1/8] net: socket: intrudoce
 SKB_DROP_REASON_SOCKET_FILTER

On 1/27/22 2:13 AM, menglong8.dong@...il.com wrote:
> From: Menglong Dong <imagedong@...cent.com>
> 
> Introduce SKB_DROP_REASON_SOCKET_FILTER, which is used as the reason
> of skb drop out of socket filter. Meanwhile, replace
> SKB_DROP_REASON_TCP_FILTER with it.
> 
> Signed-off-by: Menglong Dong <imagedong@...cent.com>
> ---
>  include/linux/skbuff.h     | 2 +-
>  include/trace/events/skb.h | 2 +-
>  net/ipv4/tcp_ipv4.c        | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
> index bf11e1fbd69b..8a636e678902 100644
> --- a/include/linux/skbuff.h
> +++ b/include/linux/skbuff.h
> @@ -318,7 +318,7 @@ enum skb_drop_reason {
>  	SKB_DROP_REASON_NO_SOCKET,
>  	SKB_DROP_REASON_PKT_TOO_SMALL,
>  	SKB_DROP_REASON_TCP_CSUM,
> -	SKB_DROP_REASON_TCP_FILTER,
> +	SKB_DROP_REASON_SOCKET_FILTER,
>  	SKB_DROP_REASON_UDP_CSUM,
>  	SKB_DROP_REASON_MAX,
>  };
> diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h
> index 3e042ca2cedb..a8a64b97504d 100644
> --- a/include/trace/events/skb.h
> +++ b/include/trace/events/skb.h
> @@ -14,7 +14,7 @@
>  	EM(SKB_DROP_REASON_NO_SOCKET, NO_SOCKET)		\
>  	EM(SKB_DROP_REASON_PKT_TOO_SMALL, PKT_TOO_SMALL)	\
>  	EM(SKB_DROP_REASON_TCP_CSUM, TCP_CSUM)			\
> -	EM(SKB_DROP_REASON_TCP_FILTER, TCP_FILTER)		\
> +	EM(SKB_DROP_REASON_SOCKET_FILTER, SOCKET_FILTER)	\
>  	EM(SKB_DROP_REASON_UDP_CSUM, UDP_CSUM)			\
>  	EMe(SKB_DROP_REASON_MAX, MAX)
>  
> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
> index b3f34e366b27..938b59636578 100644
> --- a/net/ipv4/tcp_ipv4.c
> +++ b/net/ipv4/tcp_ipv4.c
> @@ -2095,7 +2095,7 @@ int tcp_v4_rcv(struct sk_buff *skb)
>  	nf_reset_ct(skb);
>  
>  	if (tcp_filter(sk, skb)) {
> -		drop_reason = SKB_DROP_REASON_TCP_FILTER;
> +		drop_reason = SKB_DROP_REASON_SOCKET_FILTER;
>  		goto discard_and_relse;
>  	}
>  	th = (const struct tcphdr *)skb->data;

This should go to net, not net-next.

Reviewed-by: David Ahern <dsahern@...nel.org>