[PATCH] staging: ath6kl: Fixing device NULL pointer dereference

Vipin Mehta vmehta at atheros.com
Thu Dec 16 01:15:16 UTC 2010


On Tue, Dec 14, 2010 at 08:15:24PM -0800, Luis R. Rodriguez wrote:
> On Tue, Dec 14, 2010 at 5:17 PM, Vipin Mehta <vmehta at atheros.com> wrote:
> > Fixing the device instance being passed to set_wiphy_dev() from
> > NULL to the one being returned by the MMC stack probe callback.
> >
> > Signed-off-by: Vipin Mehta <vmehta at atheros.com>
> > ---
> >  drivers/staging/ath6kl/os/linux/ar6000_drv.c |   19 ++++++++++++-------
> >  1 files changed, 12 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
> > index a659f70..9f3e928 100644
> > --- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
> > +++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
> > @@ -1608,6 +1608,15 @@ ar6000_avail_ev(void *context, void *hif_handle)
> >     struct wireless_dev *wdev;
> >  #endif /* ATH6K_CONFIG_CFG80211 */
> >     A_STATUS init_status = A_OK;
> > +    HIF_DEVICE_OS_DEVICE_INFO osDevInfo;
> > +
> > +    A_MEMZERO(&osDevInfo, sizeof(osDevInfo));
> > +    if ( A_FAILED( HIFConfigureDevice(hif_handle, HIF_DEVICE_GET_OS_DEVICE,
> > +                    &osDevInfo, sizeof(osDevInfo))) )
> 
> while you are adding new code, why not use the direct Linux calls?

I'll change the use of A_MEMZERO(), A_FAILED() macros and A_STATUS
data type given that we have an incoming patch that cleans the rest
of the code for similar usage. Changing the use of HIFConfigureDevice()
will be more useful if we do it across the driver since it will require
significant changes in the data structures defined in the HIF layer.
It qualifies for an entirely separate patch and can be done later in a
systematic way.



More information about the devel mailing list