Skip to contentSkip to conversation

drivers/net/chelsio/my3126.c: inconsequent NULL checking

DISCUSSION Adrian Bunk 2 participants 2 messages Dec 7, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

The Coverity checker spotted the following inconsequent NULL checking introduced by commit f1d3d38af75789f1b82969b83b69cab540609789:

<-- snip -->

...
static struct cphy *my3126_phy_create(adapter_t *adapter,
int phy_addr, struct mdio_ops *mdio_ops)

{
        struct cphy *cphy = kzalloc(sizeof (*cphy), GFP_KERNEL);

        if (cphy)
                cphy_init(cphy, adapter, phy_addr, &my3126_ops, mdio_ops);

        INIT_WORK(&cphy->phy_update, my3216_poll, cphy);
        cphy->bmsr = 0;

        return (cphy);
}

...

<-- snip -->

It doesn't make sense to first check whether "cphy" is NULL and dereference it unconditionally later.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#1 lore raw
Quoted 19 lines · Adrian Bunk

The Coverity checker spotted the following inconsequent NULL checking introduced by commit f1d3d38af75789f1b82969b83b69cab540609789:

<-- snip -->

...
static struct cphy *my3126_phy_create(adapter_t *adapter,
int phy_addr, struct mdio_ops *mdio_ops)

{
        struct cphy *cphy = kzalloc(sizeof (*cphy), GFP_KERNEL);

        if (cphy)
                cphy_init(cphy, adapter, phy_addr, &my3126_ops, mdio_ops);

        INIT_WORK(&cphy->phy_update, my3216_poll, cphy);
        cphy->bmsr = 0;

        return (cphy);
}
Quoted 7 lines

...

<-- snip -->

It doesn't make sense to first check whether "cphy" is NULL and dereference it unconditionally later.

How about simply changing

        if (cphy)
                cphy_init(cphy, adapter, phy_addr, &my3126_ops, mdio_ops);
into
        if (!cphy)
                return NULL;

callers need to be able to handle that ofcourse, but I haven't checked that yet.

Signature · 3 lines
Jesper Juhl <[email protected]>
Don't top-post  http://www.catb.org/~esr/jargon/html/T/top-post.html
Plain text mails only, please      http://www.expita.com/nomime.html