55 lines
2.6 KiB
Diff
55 lines
2.6 KiB
Diff
From d7285900f6fa28b0be51f5d18c52bd06385f8aee Mon Sep 17 00:00:00 2001
|
|
From: Srinivas Girigowda <sgirigow@codeaurora.org>
|
|
Date: Mon, 21 Aug 2017 18:23:29 -0700
|
|
Subject: [PATCH] qcacld-2.0: Update limComputeCrc32 to pass uint16_t
|
|
|
|
qcacld-3.0 to qcacld-2.0 propagation
|
|
|
|
Update limComputeCrc32() to pass uint16_t as a length type.
|
|
Currently uint8_t is being passed as length and there will be type
|
|
mismatch when authentication frame to be encrypted will be larger
|
|
than 255 bytes.
|
|
|
|
Change-Id: Ic009197c13a2d70c9015a184acff2e82bf80eaba
|
|
CRs-Fixed: 2072937
|
|
Bug: 64438728
|
|
Signed-off-by: Srinivas Girigowda <sgirigow@codeaurora.org>
|
|
---
|
|
drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.c | 2 +-
|
|
drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.h | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.c b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.c
|
|
index 0241dc010adce..049c86aa55f78 100644
|
|
--- a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.c
|
|
+++ b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.c
|
|
@@ -647,7 +647,7 @@ limEncryptAuthFrame(tpAniSirGlobal pMac, tANI_U8 keyId, tANI_U8 *pKey, tANI_U8 *
|
|
*/
|
|
|
|
void
|
|
-limComputeCrc32(tANI_U8 *pDest, tANI_U8 * pSrc, tANI_U8 len)
|
|
+limComputeCrc32(tANI_U8 *pDest, tANI_U8 * pSrc, tANI_U16 len)
|
|
{
|
|
tANI_U32 crc;
|
|
int i;
|
|
diff --git a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.h b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.h
|
|
index 4ede5005b556f..9139ce20f3b4c 100644
|
|
--- a/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.h
|
|
+++ b/drivers/staging/qcacld-2.0/CORE/MAC/src/pe/lim/limSecurityUtils.h
|
|
@@ -1,5 +1,5 @@
|
|
/*
|
|
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
|
|
+ * Copyright (c) 2011-2015, 2017 The Linux Foundation. All rights reserved.
|
|
*
|
|
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
|
|
*
|
|
@@ -59,7 +59,7 @@ tANI_U8 limDeleteOpenAuthPreAuthNode(tpAniSirGlobal pMac);
|
|
|
|
// Encryption/Decryption related functions
|
|
tCfgWepKeyEntry *limLookUpKeyMappings(tSirMacAddr);
|
|
-void limComputeCrc32(tANI_U8 *, tANI_U8 *, tANI_U8);
|
|
+void limComputeCrc32(tANI_U8 *, tANI_U8 *, tANI_U16);
|
|
void limRC4(tANI_U8 *, tANI_U8 *, tANI_U8 *, tANI_U32, tANI_U16);
|
|
void limEncryptAuthFrame(tpAniSirGlobal, tANI_U8, tANI_U8 *, tANI_U8 *, tANI_U8 *, tANI_U32);
|
|
tANI_U8 limDecryptAuthFrame(tpAniSirGlobal, tANI_U8 *, tANI_U8 *, tANI_U8 *, tANI_U32, tANI_U16);
|