On Mon, 2007-11-26 at 10:46 +0300, Cyrill Gorcunov wrote: > This patch adds checking for NULL value returned to prevent possible > NULL pointer dereference. > Also two unneeded 'return' are removed. > > Signed-off-by: Cyrill Gorcunov <[email protected]> > --- > Any comments are welcome. I guess it's good to be paranoid, but this is a little verbose: wi0 = of_get_property(node, "device-id", NULL); + if (unlikely((!wi0))) { + printk(KERN_ERR "PCI: device-id not found.\n"); + goto error; + } wi1 = of_get_property(node, "vendor-id", NULL); + if (unlikely((!wi1))) { + printk(KERN_ERR "PCI: vendor-id not found.\n"); + goto error; + } wi2 = of_get_property(node, "class-code", NULL); + if (unlikely((!wi2))) { + printk(KERN_ERR "PCI: class-code not found.\n"); + goto error; + } wi3 = of_get_property(node, "revision-id", NULL); + if (unlikely((!wi3))) { + printk(KERN_ERR "PCI: revision-id not found.\n"); + goto error; + } Perhaps instead: wi0 = of_get_property(node, "device-id", NULL); wi1 = of_get_property(node, "vendor-id", NULL); wi2 = of_get_property(node, "class-code", NULL); wi3 = of_get_property(node, "revision-id", NULL); if (!wi0 || !wi1 || !wi2 || !wi3) { printk(KERN_ERR "PCI: Missing device tree properties.\n"); goto error; } cheers -- Michael Ellerman OzLabs, IBM Australia Development Lab wwweb: http://michael.ellerman.id.au phone: +61 2 6212 1183 (tie line 70 21183) We do not inherit the earth from our ancestors, we borrow it from our children. - S.M.A.R.T Person
Attachment:
signature.asc
Description: This is a digitally signed message part
- Follow-Ups:
- Re: [PATCH] PPC: CELLEB - fix potential NULL pointer dereference
- From: "Cyrill Gorcunov" <[email protected]>
- Re: [PATCH] PPC: CELLEB - fix potential NULL pointer dereference
- References:
- [PATCH] PPC: CELLEB - fix potential NULL pointer dereference
- From: "Cyrill Gorcunov" <[email protected]>
- [PATCH] PPC: CELLEB - fix potential NULL pointer dereference
- Prev by Date: Re: [patch 2/2] reiser4: new export ops
- Next by Date: Re: Linux 2.6 kernel module compilation without using KBUILD
- Previous by thread: Re: [PATCH] PPC: CELLEB - fix potential NULL pointer dereference
- Next by thread: Re: [PATCH] PPC: CELLEB - fix potential NULL pointer dereference
- Index(es):
 |