diff options
| author | Devendra Naga | 2012-09-05 12:03:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-09-05 20:59:51 +0200 |
| commit | b8131fc0e1c37563c278743e6def971be993cdda (patch) | |
| tree | ccea2206a155f1ae79c892d337627e6782434a35 /drivers/staging/slicoss | |
| parent | staging: slicoss: remove return statement at the end of slic_mcast_set_list (diff) | |
| download | kernel-qcow2-linux-b8131fc0e1c37563c278743e6def971be993cdda.tar.gz kernel-qcow2-linux-b8131fc0e1c37563c278743e6def971be993cdda.tar.xz kernel-qcow2-linux-b8131fc0e1c37563c278743e6def971be993cdda.zip | |
staging: slicoss: fix a null deref when pci_alloc_consistent fail
we are dereferencing the pshmem , and the pci_alloc_consistent can fail
returning null,
do a memcpy if we have a valid pshmem
Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/slicoss')
| -rw-r--r-- | drivers/staging/slicoss/slicoss.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 0755bc14229c..cd920dad85cd 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -3701,9 +3701,8 @@ static void slic_init_adapter(struct net_device *netdev, phys_shmem); ASSERT(adapter->pshmem); - memset(adapter->pshmem, 0, sizeof(struct slic_shmem)); - - return; + if (adapter->pshmem) + memset(adapter->pshmem, 0, sizeof(struct slic_shmem)); } static const struct net_device_ops slic_netdev_ops = { |