Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Staging: vt6655-6: shift wrap buf in s_vFillTxKey()

byKeyIndex is an unsigned char between 0 and 0xf.  If it is any value
higher than 1, then we will hit an integer wrap issue here.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Dan Carpenter 12 years ago
parent
f20fbdf829
commit
ff4573a7af
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/staging/vt6655/rxtx.c
  2. 1 1
      drivers/staging/vt6656/rxtx.c

+ 1 - 1
drivers/staging/vt6655/rxtx.c
View File 

@@ -242,7 +242,7 @@ s_vFillTxKey (
 
         }
 
         // Append IV after Mac Header
 
         *pdwIV &= WEP_IV_MASK;//00000000 11111111 11111111 11111111
 
-        *pdwIV |= (byKeyIndex << 30);
 
+        *pdwIV |= (unsigned long)byKeyIndex << 30;
 
         *pdwIV = cpu_to_le32(*pdwIV);
 
         pDevice->dwIVCounter++;
 
         if (pDevice->dwIVCounter > WEP_IV_MASK) {

+ 1 - 1
drivers/staging/vt6656/rxtx.c
View File 

@@ -355,7 +355,7 @@ s_vFillTxKey (
 
         }
 
         // Append IV after Mac Header
 
         *pdwIV &= WEP_IV_MASK;//00000000 11111111 11111111 11111111
 
-        *pdwIV |= (pDevice->byKeyIndex << 30);
 
+        *pdwIV |= (unsigned long)pDevice->byKeyIndex << 30;
 
         *pdwIV = cpu_to_le32(*pdwIV);
 
         pDevice->dwIVCounter++;
 
         if (pDevice->dwIVCounter > WEP_IV_MASK) {