Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e34fd879 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Marcel Holtmann
Browse files

mac802154: Avoid rtnl deadlock in mac802154_wpan_ioctl(). 



->ndo_do_ioctl() can be entered with the rtnl lock already held,
for example when sending a wext ioctl to a device (in which case
the rtnl lock is taken by wext_ioctl_dispatch()), but
mac802154_wpan_ioctl() currently unconditionally takes the rtnl
lock on entry, which can cause deadlocks.

To fix this, bail out of mac802154_wpan_ioctl() before taking the
rtnl lock if the ioctl cmd is not one of the cmds we implement.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Acked-by: default avatarAlexander Aring <alex.aring@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent f72186d2

net/mac802154/iface.c

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
		(struct sockaddr_ieee802154 *)&ifr->ifr_addr;

	int err = -ENOIOCTLCMD;



	if (cmd != SIOCGIFADDR && cmd != SIOCSIFADDR)

		return err;



	rtnl_lock();



	switch (cmd) {