leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llc2: Call llc_station_exit() on llc2_init() failure path

Browse Source 
Otherwise the station packet handler will remain registered even though
the module is unloaded.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Hutchings 2012-08-13 02:50:43 +00:00 committed by David S. Miller
parent 6024935f5f
commit f4f8720feb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/llc/af_llc.c
View File

@ -1206,7 +1206,7 @@ static int __init llc2_init(void)
rc = llc_proc_init();
if (rc != 0) {
printk(llc_proc_err_msg);
goto out_unregister_llc_proto;
goto out_station;
}
rc = llc_sysctl_init();
if (rc) {
@ -1226,7 +1226,8 @@ out_sysctl:
llc_sysctl_exit();
out_proc:
llc_proc_exit();
out_unregister_llc_proto:
out_station:
llc_station_exit();
proto_unregister(&llc_proto);
goto out;
}

2
net/llc/llc_station.c
View File

@ -701,7 +701,7 @@ void __init llc_station_init(void)
llc_main_station.state = LLC_STATION_STATE_UP;
}
void __exit llc_station_exit(void)
void llc_station_exit(void)
{
llc_set_station_handler(NULL);
}