linux-kernel - Re: [PATCH] ipv4: ip_gre: Fix set but not used warning in ipgre

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]

Message-ID: <20250113061942.57178-1-kuniyu@amazon.com>
Date: Mon, 13 Jan 2025 15:19:42 +0900
From: Kuniyuki Iwashima <kuniyu@...zon.com>
To: <geert@...ux-m68k.org>
CC: <davem@...emloft.net>, <dsahern@...nel.org>, <edumazet@...gle.com>,
	<horms@...nel.org>, <kuba@...nel.org>, <linux-kernel@...r.kernel.org>,
	<lkp@...el.com>, <netdev@...r.kernel.org>, <pabeni@...hat.com>
Subject: Re: [PATCH] ipv4: ip_gre: Fix set but not used warning in ipgre_err() if IPv4-only

From: Geert Uytterhoeven <geert@...ux-m68k.org>
Date: Sun, 12 Jan 2025 10:05:10 +0100
> @@ -191,8 +189,9 @@ static int ipgre_err(struct sk_buff *skb, u32 info,
>  
>  #if IS_ENABLED(CONFIG_IPV6)
>  	if (tpi->proto == htons(ETH_P_IPV6) &&
> -	    !ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4 + tpi->hdr_len,
> -					type, data_len))
> +	    !ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4 + tpi->hdr_len, type,
> +		type == ICMP_TIME_EXCEEDED ?
> +		icmp_hdr(skb)->un.reserved[1] * 4 /* RFC 4884 4.1 */ : 0))
>  		return 0;
>  #endif

No need to pack everything in a single line.

---8<---
#if IS_ENABLED(CONFIG_IPV6)
	if (tpi->proto == htons(ETH_P_IPV6)) {
		unsigned int data_len = 0;

		if (type == ICMP_TIME_EXCEEDED)
			data_len = icmp_hdr(skb)->un.reserved[1] * 4; /* RFC 4884 4.1 */

		if (!ip6_err_gen_icmpv6_unreach(skb, iph->ihl * 4 + tpi->hdr_len,
						type, data_len)
			return 0;
	}
#endif
---8<---


For the future submission, please specify the target tree in Subject.

  [PATCH net-next v2] ...

See: Documentation/process/maintainer-netdev.rst

Thanks