netdev - Re: [PATCH 1/1] ipv4: ip_gre: fix return value check in erspan_fb

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: <20230718174808.58307-1-kuniyu@amazon.com>
Date: Tue, 18 Jul 2023 10:48:08 -0700
From: Kuniyuki Iwashima <kuniyu@...zon.com>
To: <ruc_gongyuanjun@....com>
CC: <davem@...emloft.net>, <dsahern@...nel.org>, <edumazet@...gle.com>,
	<netdev@...r.kernel.org>, <kuniyu@...zon.com>
Subject: Re: [PATCH 1/1] ipv4: ip_gre: fix return value check in erspan_fb_xmit()

From: Yuanjun Gong <ruc_gongyuanjun@....com>
Date: Mon, 17 Jul 2023 22:49:02 +0800
> goto err_free_skb if an unexpected result is returned by pskb_tirm()
> in erspan_fb_xmit().
> 
> Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@....com>

Fixes: 1a66a836da63 ("gre: add collect_md mode to ERSPAN tunnel")
Reviewed-by: Kuniyuki Iwashima <kuniyu@...zon.com>


> ---
>  net/ipv4/ip_gre.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
> index 81a1cce1a7d1..914cc941af55 100644
> --- a/net/ipv4/ip_gre.c
> +++ b/net/ipv4/ip_gre.c
> @@ -548,7 +548,8 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev)
>  		goto err_free_skb;
>  
>  	if (skb->len > dev->mtu + dev->hard_header_len) {
> -		pskb_trim(skb, dev->mtu + dev->hard_header_len);
> +		if (pskb_trim(skb, dev->mtu + dev->hard_header_len))
> +			goto err_free_skb;
>  		truncate = true;
>  	}
>  
> -- 
> 2.17.1
>