OSDN Git Service

ice: Remove possible null dereference
authorTony Nguyen <anthony.l.nguyen@intel.com>
Thu, 6 Feb 2020 09:20:08 +0000 (01:20 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 12 Feb 2020 19:48:51 +0000 (11:48 -0800)
Commit 1f45ebe0d8fb ("ice: add extra check for null Rx descriptor") moved
the call to ice_construct_skb() under a null check as Coverity reported a
possible use of null skb. However, the original call was not deleted, do so
now.

Fixes: 1f45ebe0d8fb ("ice: add extra check for null Rx descriptor")
Reported-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ice/ice_txrx.c

index fd17ace..1d4755a 100644 (file)
@@ -1078,8 +1078,6 @@ construct_skb:
                                skb = ice_build_skb(rx_ring, rx_buf, &xdp);
                        else
                                skb = ice_construct_skb(rx_ring, rx_buf, &xdp);
-               } else {
-                       skb = ice_construct_skb(rx_ring, rx_buf, &xdp);
                }
                /* exit if we failed to retrieve a buffer */
                if (!skb) {