diff options
| author | Jiri Bohac <jbohac@suse.cz> | 2007-02-08 16:02:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-02-08 16:02:21 -0800 |
| commit | 1539b98b561754252dd520b98fa03a688a4f81b5 (patch) | |
| tree | 4121f7c5d25d6008a919dd5ec92b29990a49d6f9 /net/ipx | |
| parent | 42c05f6e6e3d57495054a4cae35850b3f7d1c343 (diff) | |
| download | linux-stable-1539b98b561754252dd520b98fa03a688a4f81b5.tar.gz linux-stable-1539b98b561754252dd520b98fa03a688a4f81b5.tar.bz2 linux-stable-1539b98b561754252dd520b98fa03a688a4f81b5.zip | |
[IPX]: Fix NULL pointer dereference on ipx unload
Fixes a null pointer dereference when unloading the ipx module.
On initialization of the ipx module, registering certain packet
types can fail. When this happens, unloading the module later
dereferences NULL pointers. This patch fixes that. Please apply.
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipx')
| -rw-r--r-- | net/ipx/af_ipx.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index 76c661566dfd..89f283c51dff 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c @@ -2035,19 +2035,27 @@ static void __exit ipx_proto_finito(void) ipxitf_cleanup(); - unregister_snap_client(pSNAP_datalink); - pSNAP_datalink = NULL; + if (pSNAP_datalink) { + unregister_snap_client(pSNAP_datalink); + pSNAP_datalink = NULL; + } - unregister_8022_client(p8022_datalink); - p8022_datalink = NULL; + if (p8022_datalink) { + unregister_8022_client(p8022_datalink); + p8022_datalink = NULL; + } dev_remove_pack(&ipx_8023_packet_type); - destroy_8023_client(p8023_datalink); - p8023_datalink = NULL; + if (p8023_datalink) { + destroy_8023_client(p8023_datalink); + p8023_datalink = NULL; + } dev_remove_pack(&ipx_dix_packet_type); - destroy_EII_client(pEII_datalink); - pEII_datalink = NULL; + if (pEII_datalink) { + destroy_EII_client(pEII_datalink); + pEII_datalink = NULL; + } proto_unregister(&ipx_proto); sock_unregister(ipx_family_ops.family); |