summary refs log tree commit diff
path: root/drivers/net
diff options
context:
space:
mode:
authorTony Nguyen <anthony.l.nguyen@intel.com>2020-02-06 01:20:08 -0800
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2020-02-12 11:48:51 -0800
commit0a6ea04e3bbd20833d2b49296e5adc1c5bb86386 (patch)
tree59dff15dbb7302117548262e31a1b336cd07797a /drivers/net
parentcf8fc2a0863f9ff27ebd2efcdb1f7d378b9fb8a6 (diff)
downloadlinux-0a6ea04e3bbd20833d2b49296e5adc1c5bb86386.tar.gz
ice: Remove possible null dereference
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/intel/ice/ice_txrx.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
index fd17ace6b226..1d4755acca3d 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.c
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
@@ -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) {