raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

ice: Don't dereference NULL in ice_gnss_read error path

Browse Source 
If pf is NULL in ice_gnss_read() then it will be dereferenced
in the error path by a call to dev_dbg(ice_pf_to_dev(pf), ...).

Avoid this by simply returning in this case.
If logging is desired an alternate approach might be to
use pr_err() before returning.

Flagged by Smatch as:

  .../ice_gnss.c:196 ice_gnss_read() error: we previously assumed 'pf' could be null (see line 131)

Fixes: 43113ff734 ("ice: add TTY for GNSS module for E810T device")
Signed-off-by: Simon Horman <horms@kernel.org>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Simon Horman
2023-05-25 12:52:58 +02:00
committed by Tony Nguyen
parent 6c0ec7ab5a
commit 05a1308a2e
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/intel/ice/ice_gnss.c
View File

@@ -96,12 +96,7 @@ static void ice_gnss_read(struct kthread_work *work)
int err = 0; int err = 0;
pf = gnss->back; pf = gnss->back;
if (!pf) { if (!pf || !test_bit(ICE_FLAG_GNSS, pf->flags))
err = -EFAULT;
goto exit;
}
if (!test_bit(ICE_FLAG_GNSS, pf->flags))
return; return;
hw = &pf->hw; hw = &pf->hw;
@@ -159,7 +154,6 @@ free_buf:
free_page((unsigned long)buf); free_page((unsigned long)buf);
requeue: requeue:
kthread_queue_delayed_work(gnss->kworker, &gnss->read_work, delay); kthread_queue_delayed_work(gnss->kworker, &gnss->read_work, delay);
exit:
if (err) if (err)
dev_dbg(ice_pf_to_dev(pf), "GNSS failed to read err=%d\n", err); dev_dbg(ice_pf_to_dev(pf), "GNSS failed to read err=%d\n", err);
} }