Subject: Re: [PATCH net] ipv4: icmp: fix null-ptr-deref in icmp_build_probe(): manual merge

From: Jakub Kicinski <[email-masked]>
Date: Mon, 6 Apr 2026 09:46:24 -0700

On Mon, 6 Apr 2026 18:10:14 +0200 Matthieu Baerts wrote:
> On 06/04/2026 17:36, Jakub Kicinski wrote:
> > On Mon, 6 Apr 2026 12:48:28 +0200 Matthieu Baerts wrote:  
> >>  -			dev = ipv6_stub->ipv6_dev_find(net, &iio->ident.addr.ip_addr.ipv6_addr, dev);
> >>  +			dev = ipv6_dev_find(net, &iio->ident.addr.ip_addr.ipv6_addr, dev);
> >> + 			/*
> >> + 			 * If IPv6 identifier lookup is unavailable, silently
> >> + 			 * discard the request instead of misreporting NO_IF.
> >> + 			 */
> >> + 			if (IS_ERR(dev))
> >> + 				return false;
> >> + 
> >>   			dev_hold(dev);
> >>   			break;  
> > 
> > See my reply, AFAIU we can just delete this new check in net-next.  
> 
> Good idea.
> 
> Should this not be done in an explicit patch, rather than "hidden"
> during the merge?

Dunno, it's not a huge change, feels like a good fit for a merge.