Commit 5326fc94 authored Aug 09, 2024 by Kuniyuki Iwashima Committed by Wen Zhiwei Nov 06, 2024

ipv4: Check !in_dev earlier for ioctl(SIOCSIFADDR).

stable inclusion
from stable-v6.6.55
commit d4c4653b60debfe1e456b6a9ed69ebf8e73fecb3
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IB0MX4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d4c4653b60debfe1e456b6a9ed69ebf8e73fecb3



--------------------------------

[ Upstream commit e3af3d3c5b26c33a7950e34e137584f6056c4319 ]

dev->ip_ptr could be NULL if we set an invalid MTU.

Even then, if we issue ioctl(SIOCSIFADDR) for a new IPv4 address,
devinet_ioctl() allocates struct in_ifaddr and fails later in
inet_set_ifa() because in_dev is NULL.

Let's move the check earlier.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20240809235406.50187-2-kuniyu@amazon.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Wen Zhiwei <wenzhiwei@kylinos.cn>

parent a42264eb

net/ipv4/devinet.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -569,10 +569,6 @@ static int inet_set_ifa(struct net_device dev, struct in_ifaddr ifa)

		ASSERT_RTNL();

		if (!in_dev) {
		inet_free_ifa(ifa);
		return -ENOBUFS;
		}
		ipv4_devconf_setall(in_dev);
		neigh_parms_data_state_setall(in_dev->arp_parms);
		if (ifa->ifa_dev != in_dev) {
		@@ -1174,6 +1170,8 @@ int devinet_ioctl(struct net net, unsigned int cmd, struct ifreq ifr)

		if (!ifa) {
		ret = -ENOBUFS;
		if (!in_dev)
		break;
		ifa = inet_alloc_ifa();
		if (!ifa)
		break;