From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C2581B424F; Sun, 7 Sep 2025 20:12:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757275971; cv=none; b=r5yzUG3OXASKeZyRUNzSLTvPmo+3S7xGUF+aX/yAQL3MfHacVwi+rillbQiecnc9RouxmwAK0NywZhHiccaOw7I/jRUihy/QWBIMhyb1agGrRgN/q68MAwfxS7jwe9y6HazvUl6dl4OjKSY4TTlQkZUPYqUxWVyaB+OWpGKtpao= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757275971; c=relaxed/simple; bh=bIuM+2aBGiij3j1KsxjJJ4geqju2EGkIutUBBPBD4qI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oPDifm5JMPryTXJurVRIByDj60GW5nWSp+XD/5n5e62tSL60u/ixr/LbACHdGugmLSGYwO+Is74yflaw3rIrSCNreXLt+0+nXOeQX7vocX2RZ1IJgfuX9gGOncJfQW/pi595vW3Zm/Ye8IFQUka09ht524ghT7+0sR+02jN1vHg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gb2qzkiO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gb2qzkiO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6B65C4CEF0; Sun, 7 Sep 2025 20:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1757275971; bh=bIuM+2aBGiij3j1KsxjJJ4geqju2EGkIutUBBPBD4qI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gb2qzkiOSbZJ1FwXAFwDQrudY+0NIvOy6MCw92w0+gZXsSCY1LYasZUm6mY5M+Vm1 rFMrwB+sqECr3VrtyogBnasTbBq1ZOLTeNIBCWygbSvIXzG1hds/11/aCbHq31Sa/+ A6hywFesIJnN+PBL3z3HOJu7MGfO/zUJI3Cac55M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Simon Horman , Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 22/64] ipv4: Fix NULL vs error pointer check in inet_blackhole_dev_init() Date: Sun, 7 Sep 2025 21:58:04 +0200 Message-ID: <20250907195604.003708563@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250907195603.394640159@linuxfoundation.org> References: <20250907195603.394640159@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter [ Upstream commit a51160f8da850a65afbf165f5bbac7ffb388bf74 ] The inetdev_init() function never returns NULL. Check for error pointers instead. Fixes: 22600596b675 ("ipv4: give an IPv4 dev to blackhole_netdev") Signed-off-by: Dan Carpenter Reviewed-by: Simon Horman Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/aLaQWL9NguWmeM1i@stanley.mountain Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv4/devinet.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 33e87b442b475..6b0dc07f273a2 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -332,14 +332,13 @@ static void inetdev_destroy(struct in_device *in_dev) static int __init inet_blackhole_dev_init(void) { - int err = 0; + struct in_device *in_dev; rtnl_lock(); - if (!inetdev_init(blackhole_netdev)) - err = -ENOMEM; + in_dev = inetdev_init(blackhole_netdev); rtnl_unlock(); - return err; + return PTR_ERR_OR_ZERO(in_dev); } late_initcall(inet_blackhole_dev_init); -- 2.50.1