[PATCH upstream for stable 2/8] staging: vt6656: 64 bit- Correctly address void structure.

[Ben Hutchings]

On Thu, 2012-12-27 at 13:01 +0000, Malcolm Priestley wrote:
> upstream 
> commit e2efba763b472835fdface597fe2216b3403967e
> 
> Tested on kernels 2.6.35, 3.0, 3.2, 3.5 & 3.7
> 
> staging: vt6656: 64 bit- Correctly address void structure.
>     
> Fixes 64 bit deadlock on successful association.
> 
> Cc: stable at kernel.org  # 2.6.35+
> Signed-off-by: Malcolm Priestley <tvboxspy at gmail.com>
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> 
> diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
> index 0f35a9a..1f87213 100644
> --- a/drivers/staging/vt6656/rxtx.c
> +++ b/drivers/staging/vt6656/rxtx.c
> @@ -1452,12 +1452,10 @@ s_bPacketToWirelessUsb(
>  
> 
>      pvRrvTime = pMICHDR = pvRTS = pvCTS = pvTxDataHd = NULL;
> -    if ((bNeedEncryption) && (pTransmitKey != NULL))  {
> -        if (((PSKeyTable) (pTransmitKey->pvKeyTable))->bSoftWEP == TRUE) {
> -            // WEP 256
> -            bSoftWEP = TRUE;
> -        }
> -    }
> +	if (bNeedEncryption && pTransmitKey->pvKeyTable) {
> +		if (((PSKeyTable)&pTransmitKey->pvKeyTable)->bSoftWEP == TRUE)
> +			bSoftWEP = TRUE; /* WEP 256 */
> +	}

This cast is blatantly wrong - pvKeyTable points to and SKeyTable; it's
not the first element of an SKeyTable.

Greg, I suggest you revert this upstream as it's only 'fixing' the
problem by chance.

Ben.

>      pTxBufHead = (PTX_BUFFER) usbPacketBuf;
>      memset(pTxBufHead, 0, sizeof(TX_BUFFER));
> 
> 


-- 
Ben Hutchings
The world is coming to an end.	Please log off.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 828 bytes
Desc: This is a digitally signed message part
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20121227/2e088fa8/attachment.sig>