Messages in this thread | | | Date | Mon, 12 May 2008 18:51:42 +0200 | From | Francois Romieu <> | Subject | Re: [PATCH 4/6] drivers/net/fs_enet: remove null pointer dereference |
| |
Julia Lawall <julia@diku.dk> : [...] > diff -u -p a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c > --- a/drivers/net/fs_enet/fs_enet-main.c 2008-04-27 11:41:11.000000000 +0200 > +++ b/drivers/net/fs_enet/fs_enet-main.c 2008-05-12 09:41:52.000000000 +0200 > @@ -1093,7 +1093,7 @@ err: > if (registered) > unregister_netdev(ndev); > > - if (fep != NULL) { > + if (fep && fep->ops) { > (*fep->ops->free_bd)(ndev); > (*fep->ops->cleanup_data)(ndev); > }
Extra cookies for the nice soul who: - removes the 'if (registered)' test (it can not happen) - uses different error lablels and unrolls the error path. I can not claim that the current error path is wrong but it would not hurt if it was more trivially balanced.
-- Ueimor
| |