netdev - Re: [PATCH net-next] net: flow_dissector: do not set invalid PPP protocol

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] [day] [month] [year] [list]

Date:   Sun, 3 Oct 2021 10:38:18 +0300
From:   Boris Sukholitko <boris.sukholitko@...adcom.com>
To:     netdev@...r.kernel.org, Jamal Hadi Salim <jhs@...atatu.com>,
        Jiri Pirko <jiri@...nulli.us>,
        Cong Wang <xiyou.wangcong@...il.com>
Cc:     "David S . Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>, wangqing@...o.com,
        wenxu@...oud.cn, eranbe@...dia.com, dcaratti@...hat.com,
        gustavoars@...nel.org, zhangkaiheb@....com,
        vladimir.oltean@....com, alobakin@...me,
        Ilya Lifshits <ilya.lifshits@...adcom.com>
Subject: Re: [PATCH net-next] net: flow_dissector: do not set invalid PPP
 protocol

Hi,

Please disregard, I see that the patch has been applied already.

My feeble defense is that the previous patch has "Not Applicable" state
on patchwork for some reason:

https://patchwork.kernel.org/project/netdevbpf/patch/20210929113223.22108-1-boris.sukholitko@broadcom.com/

Thanks,
Boris.

On Sun, Oct 03, 2021 at 10:13:45AM +0300, Boris Sukholitko wrote:
> The following flower filter fails to match non-PPP_IP{V6} packets
> wrapped in PPP_SES protocol:
> 
> tc filter add dev eth0 ingress protocol ppp_ses flower \
>         action simple sdata hi64
> 
> The reason is that proto local variable is being set even when
> FLOW_DISSECT_RET_OUT_BAD status is returned.
> 
> The fix is to avoid setting proto variable if the PPP protocol is unknown.
> 
> Signed-off-by: Boris Sukholitko <boris.sukholitko@...adcom.com>
> ---
>  net/core/flow_dissector.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
> index bac0184cf3de..7d0a9f84aaf7 100644
> --- a/net/core/flow_dissector.c
> +++ b/net/core/flow_dissector.c
> @@ -1196,9 +1196,8 @@ bool __skb_flow_dissect(const struct net *net,
>  			break;
>  		}
>  
> -		proto = hdr->proto;
>  		nhoff += PPPOE_SES_HLEN;
> -		switch (proto) {
> +		switch (hdr->proto) {
>  		case htons(PPP_IP):
>  			proto = htons(ETH_P_IP);
>  			fdret = FLOW_DISSECT_RET_PROTO_AGAIN;
> -- 
> 2.29.2
> 

Download attachment "smime.p7s" of type "application/pkcs7-signature" (4221 bytes)