Re: [PATCH bluetooth-next 1/4] mac802154: fix hold rtnl while ioctl

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello.

On 22/05/15 10:57, Alexander Aring wrote:
This patch fixes an issue to set address configuration with ioctl.
Accessing the mib requires rtnl lock and the ndo_do_ioctl doesn't hold
the rtnl lock while this callback is called. This patch do that
manually.

Signed-off-by: Alexander Aring <alex.aring@xxxxxxxxx>
Reported-by: Matteo Petracca <matteo.petracca@xxxxxxxx>
---
  net/mac802154/iface.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c
index 91b75ab..2a58788 100644
--- a/net/mac802154/iface.c
+++ b/net/mac802154/iface.c
@@ -62,8 +62,7 @@ mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
  		(struct sockaddr_ieee802154 *)&ifr->ifr_addr;
  	int err = -ENOIOCTLCMD;
- ASSERT_RTNL();
-
+	rtnl_lock();
  	spin_lock_bh(&sdata->mib_lock);
switch (cmd) {
@@ -90,6 +89,7 @@ mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
  	case SIOCSIFADDR:
  		if (netif_running(dev)) {
  			spin_unlock_bh(&sdata->mib_lock);
+			rtnl_unlock();
  			return -EBUSY;
  		}
@@ -112,6 +112,7 @@ mac802154_wpan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
  	}
spin_unlock_bh(&sdata->mib_lock);
+	rtnl_unlock();
  	return err;
  }
Reviewed-by: Stefan Schmidt <stefan@xxxxxxxxxxxxxxx>

This includes some smoke testing between two nodes (atusb and at86rf233), Basically ping6 with various sizes and a count of 1000 pings. No problem showed up with these patches during the testing.

regards
Stefan Schmidt
--
To unsubscribe from this list: send the line "unsubscribe linux-wpan" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Photo]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux