samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Init crypto params with default value

Browse Source 
Crypto params are not initalized with default values.
Crypto params initalized with default value during vdev
and peer creation.

Change-Id: I8adacc8b2770e3518bfbfe2da2eb3f6e0d9a5586
Crs-Fixed: 2251816
This commit is contained in:
Ashok Ponnaiah
2018-06-12 09:24:29 +05:30
committed by nshrivas
parent d58eaf419e
commit 513c8ead13
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
umac/cmn_services/crypto/src/wlan_crypto_def_i.h
View File

@@ -280,7 +280,9 @@ static inline void wlan_crypto_put_be64(u8 *a, u64 val)
#define CLEAR_PARAM(__param, __val) ((__param) &= ((~1) << (__val))) #define CLEAR_PARAM(__param, __val) ((__param) &= ((~1) << (__val)))
#define RESET_AUTHMODE(_param) ((_param)->authmodeset = 0) #define RESET_AUTHMODE(_param) ((_param)->authmodeset = \
(1 << WLAN_CRYPTO_AUTH_OPEN))
#define SET_AUTHMODE(_param, _mode) ((_param)->authmodeset |= (1 << (_mode))) #define SET_AUTHMODE(_param, _mode) ((_param)->authmodeset |= (1 << (_mode)))
#define HAS_AUTHMODE(_param, _mode) ((_param)->authmodeset & (1 << (_mode))) #define HAS_AUTHMODE(_param, _mode) ((_param)->authmodeset & (1 << (_mode)))
@@ -298,7 +300,8 @@ static inline void wlan_crypto_put_be64(u8 *a, u64 val)
(((_param1)->authmodeset & (_param2)->authmodeset) != 0) (((_param1)->authmodeset & (_param2)->authmodeset) != 0)
#define RESET_UCAST_CIPHERS(_param) ((_param)->ucastcipherset = 0) #define RESET_UCAST_CIPHERS(_param) ((_param)->ucastcipherset =\
(1 << WLAN_CRYPTO_CIPHER_NONE))
#define SET_UCAST_CIPHER(_param, _c) ((_param)->ucastcipherset |= (1 << (_c))) #define SET_UCAST_CIPHER(_param, _c) ((_param)->ucastcipherset |= (1 << (_c)))
#define HAS_UCAST_CIPHER(_param, _c) ((_param)->ucastcipherset & (1 << (_c))) #define HAS_UCAST_CIPHER(_param, _c) ((_param)->ucastcipherset & (1 << (_c)))
@@ -319,7 +322,8 @@ static inline void wlan_crypto_put_be64(u8 *a, u64 val)
#define UCIPHER_IS_SMS4(_param) \ #define UCIPHER_IS_SMS4(_param) \
HAS_UCAST_CIPHER((_param), WLAN_CRYPTO_CIPHER_WAPI_SMS4) HAS_UCAST_CIPHER((_param), WLAN_CRYPTO_CIPHER_WAPI_SMS4)
#define RESET_MCAST_CIPHERS(_param) ((_param)->mcastcipherset = 0) #define RESET_MCAST_CIPHERS(_param) ((_param)->mcastcipherset = \
(1 << WLAN_CRYPTO_CIPHER_NONE))
#define SET_MCAST_CIPHER(_param, _c) ((_param)->mcastcipherset |= (1 << (_c))) #define SET_MCAST_CIPHER(_param, _c) ((_param)->mcastcipherset |= (1 << (_c)))
#define HAS_MCAST_CIPHER(_param, _c) ((_param)->mcastcipherset & (1 << (_c))) #define HAS_MCAST_CIPHER(_param, _c) ((_param)->mcastcipherset & (1 << (_c)))
#define HAS_ANY_MCAST_CIPHER(_param) ((_param)->mcastcipherset) #define HAS_ANY_MCAST_CIPHER(_param) ((_param)->mcastcipherset)
@@ -343,7 +347,8 @@ static inline void wlan_crypto_put_be64(u8 *a, u64 val)
#define MCIPHER_IS_SMS4(_param) \ #define MCIPHER_IS_SMS4(_param) \
HAS_MCAST_CIPHER((_param), WLAN_CRYPTO_CIPHER_WAPI_SMS4) HAS_MCAST_CIPHER((_param), WLAN_CRYPTO_CIPHER_WAPI_SMS4)
#define RESET_MGMT_CIPHERS(_param) ((_param)->mgmtcipherset = 0) #define RESET_MGMT_CIPHERS(_param) ((_param)->mgmtcipherset = \
(1 << WLAN_CRYPTO_CIPHER_NONE))
#define SET_MGMT_CIPHER(_param, _c) ((_param)->mgmtcipherset |= (1 << (_c))) #define SET_MGMT_CIPHER(_param, _c) ((_param)->mgmtcipherset |= (1 << (_c)))
#define HAS_MGMT_CIPHER(_param, _c) ((_param)->mgmtcipherset & (1 << (_c))) #define HAS_MGMT_CIPHER(_param, _c) ((_param)->mgmtcipherset & (1 << (_c)))
#define IS_MGMT_CIPHER(_c) ((_c == WLAN_CRYPTO_CIPHER_AES_CMAC) || \ #define IS_MGMT_CIPHER(_c) ((_c == WLAN_CRYPTO_CIPHER_AES_CMAC) || \
@@ -362,7 +367,8 @@ static inline void wlan_crypto_put_be64(u8 *a, u64 val)
#define MGMT_CIPHER_IS_GMAC256(_param) \ #define MGMT_CIPHER_IS_GMAC256(_param) \
HAS_MGMT_CIPHER((_param), WLAN_CRYPTO_CIPHER_AES_GMAC_256) HAS_MGMT_CIPHER((_param), WLAN_CRYPTO_CIPHER_AES_GMAC_256)
#define RESET_KEY_MGMT(_param) ((_param)->key_mgmt = 0) #define RESET_KEY_MGMT(_param) ((_param)->key_mgmt = \
(1 << WLAN_CRYPTO_KEY_MGMT_NONE))
#define SET_KEY_MGMT(_param, _c) ((_param)->key_mgmt |= (1 << (_c + 1))) #define SET_KEY_MGMT(_param, _c) ((_param)->key_mgmt |= (1 << (_c + 1)))
#define HAS_KEY_MGMT(_param, _c) ((_param)->key_mgmt & (1 << (_c + 1))) #define HAS_KEY_MGMT(_param, _c) ((_param)->key_mgmt & (1 << (_c + 1)))

16
umac/cmn_services/crypto/src/wlan_crypto_obj_mgr.c
View File

@@ -113,6 +113,14 @@ static QDF_STATUS wlan_crypto_vdev_obj_create_handler(
return QDF_STATUS_E_NOMEM; return QDF_STATUS_E_NOMEM;
crypto_param = &(crypto_priv->crypto_params); crypto_param = &(crypto_priv->crypto_params);
RESET_AUTHMODE(crypto_param);
RESET_UCAST_CIPHERS(crypto_param);
RESET_MCAST_CIPHERS(crypto_param);
RESET_MGMT_CIPHERS(crypto_param);
RESET_KEY_MGMT(crypto_param);
RESET_CIPHER_CAP(crypto_param);
pdev = wlan_vdev_get_pdev(vdev); pdev = wlan_vdev_get_pdev(vdev);
wlan_pdev_obj_lock(pdev); wlan_pdev_obj_lock(pdev);
if (wlan_pdev_nif_fw_cap_get(pdev, WLAN_SOC_C_WEP)) if (wlan_pdev_nif_fw_cap_get(pdev, WLAN_SOC_C_WEP))
@@ -150,6 +158,7 @@ static QDF_STATUS wlan_crypto_peer_obj_create_handler(
void *arg) void *arg)
{ {
struct wlan_crypto_comp_priv *crypto_priv; struct wlan_crypto_comp_priv *crypto_priv;
struct wlan_crypto_params *crypto_param;
QDF_STATUS status; QDF_STATUS status;
if (!peer) if (!peer)
@@ -164,6 +173,13 @@ static QDF_STATUS wlan_crypto_peer_obj_create_handler(
QDF_STATUS_SUCCESS); QDF_STATUS_SUCCESS);
if (status == QDF_STATUS_SUCCESS) { if (status == QDF_STATUS_SUCCESS) {
crypto_param = &crypto_priv->crypto_params;
RESET_AUTHMODE(crypto_param);
RESET_UCAST_CIPHERS(crypto_param);
RESET_MCAST_CIPHERS(crypto_param);
RESET_MGMT_CIPHERS(crypto_param);
RESET_KEY_MGMT(crypto_param);
RESET_CIPHER_CAP(crypto_param);
if (wlan_vdev_get_selfpeer(peer->peer_objmgr.vdev) != peer) { if (wlan_vdev_get_selfpeer(peer->peer_objmgr.vdev) != peer) {
wlan_crypto_set_peer_wep_keys( wlan_crypto_set_peer_wep_keys(
wlan_peer_get_vdev(peer), peer); wlan_peer_get_vdev(peer), peer);