Skip to content

Commit

Permalink
llc2: Call llc_station_exit() on llc2_init() failure path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Ben Hutchings authored and David S. Miller committed Aug 14, 2012
1 parent 6024935 commit f4f8720
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions net/llc/af_llc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -1226,7 +1226,8 @@ static int __init llc2_init(void)
llc_sysctl_exit();
out_proc:
llc_proc_exit();
out_unregister_llc_proto:
out_station:
llc_station_exit();
proto_unregister(&llc_proto);
goto out;
}
Expand Down
2 changes: 1 addition & 1 deletion net/llc/llc_station.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

0 comments on commit f4f8720

Please sign in to comment.