Commit f157cfa3 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-rose-fix-module-unload-issues' 

Eric Dumazet says:

====================
net: rose: fix module unload issues

Bernard Pidoux reported that unloading rose module could lead
to infamous "unregistered_netdevice:" issues.

First patch is the fix, stable candidate.
Second patch is adding netdev ref tracker to af_rose.

I chose net-next to not inflict merge conflicts, because
Jakub changed dev_put_track() to netdev_put_track() in net-next.
====================

Link: https://lore.kernel.org/r/20220729091233.1030680-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9936e07e 2df91e39

include/net/rose.h

+2 −1
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct rose_sock { 
	ax25_address		dest_digis[ROSE_MAX_DIGIS];

	struct rose_neigh	*neighbour;

	struct net_device	*device;

	netdevice_tracker	dev_tracker;

	unsigned int		lci, rand;

	unsigned char		state, condition, qbitincl, defer;

	unsigned char		cause, diagnostic;

net/rose/af_rose.c

+15 −2
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ static void rose_kill_by_device(struct net_device *dev) 
			rose_disconnect(s, ENETUNREACH, ROSE_OUT_OF_ORDER, 0);

			if (rose->neighbour)

				rose->neighbour->use--;

			netdev_put(rose->device, &rose->dev_tracker);

			rose->device = NULL;

		}

	}
@@ -592,6 +593,8 @@ static struct sock *rose_make_new(struct sock *osk) 
	rose->idle	= orose->idle;

	rose->defer	= orose->defer;

	rose->device	= orose->device;

	if (rose->device)

		netdev_hold(rose->device, &rose->dev_tracker, GFP_ATOMIC);

	rose->qbitincl	= orose->qbitincl;



	return sk;
@@ -645,6 +648,7 @@ static int rose_release(struct socket *sock) 
		break;

	}



	netdev_put(rose->device, &rose->dev_tracker);

	sock->sk = NULL;

	release_sock(sk);

	sock_put(sk);
@@ -696,6 +700,7 @@ static int rose_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) 


	rose->source_addr   = addr->srose_addr;

	rose->device        = dev;

	netdev_tracker_alloc(rose->device, &rose->dev_tracker, GFP_KERNEL);

	rose->source_ndigis = addr->srose_ndigis;



	if (addr_len == sizeof(struct full_sockaddr_rose)) {
@@ -721,7 +726,6 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le 
	struct rose_sock *rose = rose_sk(sk);

	struct sockaddr_rose *addr = (struct sockaddr_rose *)uaddr;

	unsigned char cause, diagnostic;

	struct net_device *dev;

	ax25_uid_assoc *user;

	int n, err = 0;
@@ -778,9 +782,12 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le 
	}



	if (sock_flag(sk, SOCK_ZAPPED)) {	/* Must bind first - autobinding in this may or may not work */

		struct net_device *dev;



		sock_reset_flag(sk, SOCK_ZAPPED);



		if ((dev = rose_dev_first()) == NULL) {

		dev = rose_dev_first();

		if (!dev) {

			err = -ENETUNREACH;

			goto out_release;

		}
@@ -788,12 +795,15 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le 
		user = ax25_findbyuid(current_euid());

		if (!user) {

			err = -EINVAL;

			dev_put(dev);

			goto out_release;

		}



		memcpy(&rose->source_addr, dev->dev_addr, ROSE_ADDR_LEN);

		rose->source_call = user->call;

		rose->device      = dev;

		netdev_tracker_alloc(rose->device, &rose->dev_tracker,

				     GFP_KERNEL);

		ax25_uid_put(user);



		rose_insert_socket(sk);		/* Finish the bind */
@@ -1017,6 +1027,9 @@ int rose_rx_call_request(struct sk_buff *skb, struct net_device *dev, struct ros 
		make_rose->source_digis[n] = facilities.source_digis[n];

	make_rose->neighbour     = neigh;

	make_rose->device        = dev;

	/* Caller got a reference for us. */

	netdev_tracker_alloc(make_rose->device, &make_rose->dev_tracker,

			     GFP_ATOMIC);

	make_rose->facilities    = facilities;



	make_rose->neighbour->use++;

net/rose/rose_route.c

+2 −0
Original line number Diff line number Diff line
@@ -615,6 +615,8 @@ struct net_device *rose_dev_first(void) 
			if (first == NULL || strncmp(dev->name, first->name, 3) < 0)

				first = dev;

	}

	if (first)

		dev_hold(first);

	rcu_read_unlock();



	return first;