aboutsummaryrefslogtreecommitdiffstats
path: root/net/netrom/af_netrom.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2006-12-14 18:51:23 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-18 00:59:11 -0500
commita4282717c102aef2bfab1d947c392de4d8abc0ec (patch)
treeef178b6eea8cd9a8790ae58a6c19ff2aa877bcc1 /net/netrom/af_netrom.c
parent58bc57471514be9206ebcda90b1076f6be41d1c7 (diff)
[AX.25]: Fix unchecked ax25_linkfail_register uses
ax25_linkfail_register uses kmalloc and the callers were ignoring the error value. Rewrite to let the caller deal with the allocation. This allows the use of static allocation of kmalloc use entirely. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/af_netrom.c')
-rw-r--r--net/netrom/af_netrom.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index f4675bf3976c..43bbe2c9e49a 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1382,6 +1382,10 @@ static struct ax25_protocol nr_pid = {
1382 .func = nr_route_frame 1382 .func = nr_route_frame
1383}; 1383};
1384 1384
1385static struct ax25_linkfail nr_linkfail_notifier = {
1386 .func = nr_link_failed,
1387};
1388
1385static int __init nr_proto_init(void) 1389static int __init nr_proto_init(void)
1386{ 1390{
1387 int i; 1391 int i;
@@ -1430,7 +1434,7 @@ static int __init nr_proto_init(void)
1430 register_netdevice_notifier(&nr_dev_notifier); 1434 register_netdevice_notifier(&nr_dev_notifier);
1431 1435
1432 ax25_register_pid(&nr_pid); 1436 ax25_register_pid(&nr_pid);
1433 ax25_linkfail_register(nr_link_failed); 1437 ax25_linkfail_register(&nr_linkfail_notifier);
1434 1438
1435#ifdef CONFIG_SYSCTL 1439#ifdef CONFIG_SYSCTL
1436 nr_register_sysctl(); 1440 nr_register_sysctl();
@@ -1479,7 +1483,7 @@ static void __exit nr_exit(void)
1479 nr_unregister_sysctl(); 1483 nr_unregister_sysctl();
1480#endif 1484#endif
1481 1485
1482 ax25_linkfail_release(nr_link_failed); 1486 ax25_linkfail_release(&nr_linkfail_notifier);
1483 ax25_protocol_release(AX25_P_NETROM); 1487 ax25_protocol_release(AX25_P_NETROM);
1484 1488
1485 unregister_netdevice_notifier(&nr_dev_notifier); 1489 unregister_netdevice_notifier(&nr_dev_notifier);