netdev - Re: [PATCH 1/1] net: ipv4: fix return value check in esp_remove

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: <f6831ace-df6c-f0bd-188e-a2b23a75c1a8@kernel.org>
Date: Tue, 18 Jul 2023 08:44:47 -0600
From: David Ahern <dsahern@...nel.org>
To: Yuanjun Gong <ruc_gongyuanjun@....com>,
 Steffen Klassert <steffen.klassert@...unet.com>,
 Herbert Xu <herbert@...dor.apana.org.au>, netdev@...r.kernel.org
Subject: Re: [PATCH 1/1] net: ipv4: fix return value check in
 esp_remove_trailer()

On 7/17/23 8:49 AM, Yuanjun Gong wrote:
> return an error number if an unexpected result is returned by
> pskb_tirm() in esp_remove_trailer().
> 
> Signed-off-by: Yuanjun Gong <ruc_gongyuanjun@....com>
> ---
>  net/ipv4/esp4.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
> index ba06ed42e428..0660bf2bdbae 100644
> --- a/net/ipv4/esp4.c
> +++ b/net/ipv4/esp4.c
> @@ -732,7 +732,10 @@ static inline int esp_remove_trailer(struct sk_buff *skb)
>  		skb->csum = csum_block_sub(skb->csum, csumdiff,
>  					   skb->len - trimlen);
>  	}
> -	pskb_trim(skb, skb->len - trimlen);
> +	if (pskb_trim(skb, skb->len - trimlen)) {
> +		ret = -EINVAL;

pskb_trim returns the error from ___pskb_trim; use it instead of
changing it here.


> +		goto out;
> +	}
>  
>  	ret = nexthdr[1];
>