mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/af_iucv: always register net_device notifier

Browse source 
Even when running as VM guest (ie pr_iucv != NULL), af_iucv can still
open HiperTransport-based connections. For robust operation these
connections require the af_iucv_netdev_notifier, so register it
unconditionally.

Also handle any error that register_netdevice_notifier() returns.

Fixes: 9fbd87d413 ("af_iucv: handle netdev events")
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julian Wiedmann 2019-06-18 20:43:01 +02:00 committed by David S. Miller
parent 238965b71b
commit 06996c1d40
1 changed files with 20 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

27
net/iucv/af_iucv.c
View file

@ -2440,6 +2440,13 @@ static int afiucv_iucv_init(void)
return err; return err;
} }
static void afiucv_iucv_exit(void)
{
device_unregister(af_iucv_dev);
driver_unregister(&af_iucv_driver);
pr_iucv->iucv_unregister(&af_iucv_handler, 0);
}
static int __init afiucv_init(void) static int __init afiucv_init(void)
{ {
int err; int err;
@ -2473,11 +2480,18 @@ static int __init afiucv_init(void)
err = afiucv_iucv_init(); err = afiucv_iucv_init();
if (err) if (err)
goto out_sock; goto out_sock;
} else }
register_netdevice_notifier(&afiucv_netdev_notifier);
err = register_netdevice_notifier(&afiucv_netdev_notifier);
if (err)
goto out_notifier;
dev_add_pack(&iucv_packet_type); dev_add_pack(&iucv_packet_type);
return 0; return 0;
out_notifier:
if (pr_iucv)
afiucv_iucv_exit();
out_sock: out_sock:
sock_unregister(PF_IUCV); sock_unregister(PF_IUCV);
out_proto: out_proto:
@ -2491,12 +2505,11 @@ static int __init afiucv_init(void)
static void __exit afiucv_exit(void) static void __exit afiucv_exit(void)
{ {
if (pr_iucv) { if (pr_iucv) {
device_unregister(af_iucv_dev); afiucv_iucv_exit();
driver_unregister(&af_iucv_driver);
pr_iucv->iucv_unregister(&af_iucv_handler, 0);
symbol_put(iucv_if); symbol_put(iucv_if);
} else }
unregister_netdevice_notifier(&afiucv_netdev_notifier);
unregister_netdevice_notifier(&afiucv_netdev_notifier);
dev_remove_pack(&iucv_packet_type); dev_remove_pack(&iucv_packet_type);
sock_unregister(PF_IUCV); sock_unregister(PF_IUCV);
proto_unregister(&iucv_proto); proto_unregister(&iucv_proto);