* [PATCH 1/2] staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames
@ 2018-07-14 17:54 Ivan Safonov
2018-07-14 17:54 ` [PATCH 2/2] staging:r8188eu: Use lib80211 to encrypt (CCMP) " Ivan Safonov
0 siblings, 1 reply; 6+ messages in thread
From: Ivan Safonov @ 2018-07-14 17:54 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Santha Meena Ramamoorthy, Michael Straube, Janani Sankara Babu,
devel, linux-kernel, Ivan Safonov
Put data to skb, decrypt with lib80211_crypt_tkip, and place back to tx buffer.
MIC calculation will be replaced later.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_security.c | 419 +++++---------------------
1 file changed, 77 insertions(+), 342 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c
index a01290467c64..ada69efd61b3 100644
--- a/drivers/staging/rtl8188eu/core/rtw_security.c
+++ b/drivers/staging/rtl8188eu/core/rtw_security.c
@@ -12,121 +12,6 @@
#include <osdep_intf.h>
#include <net/lib80211.h>
-/* WEP related ===== */
-
-#define CRC32_POLY 0x04c11db7
-
-struct arc4context {
- u32 x;
- u32 y;
- u8 state[256];
-};
-
-static void arcfour_init(struct arc4context *parc4ctx, u8 *key, u32 key_len)
-{
- u32 t, u;
- u32 keyindex;
- u32 stateindex;
- u8 *state;
- u32 counter;
-
- state = parc4ctx->state;
- parc4ctx->x = 0;
- parc4ctx->y = 0;
- for (counter = 0; counter < 256; counter++)
- state[counter] = (u8)counter;
- keyindex = 0;
- stateindex = 0;
- for (counter = 0; counter < 256; counter++) {
- t = state[counter];
- stateindex = (stateindex + key[keyindex] + t) & 0xff;
- u = state[stateindex];
- state[stateindex] = (u8)t;
- state[counter] = (u8)u;
- if (++keyindex >= key_len)
- keyindex = 0;
- }
-}
-
-static u32 arcfour_byte(struct arc4context *parc4ctx)
-{
- u32 x;
- u32 y;
- u32 sx, sy;
- u8 *state;
-
- state = parc4ctx->state;
- x = (parc4ctx->x + 1) & 0xff;
- sx = state[x];
- y = (sx + parc4ctx->y) & 0xff;
- sy = state[y];
- parc4ctx->x = x;
- parc4ctx->y = y;
- state[y] = (u8)sx;
- state[x] = (u8)sy;
- return state[(sx + sy) & 0xff];
-}
-
-static void arcfour_encrypt(struct arc4context *parc4ctx, u8 *dest, u8 *src, u32 len)
-{
- u32 i;
-
- for (i = 0; i < len; i++)
- dest[i] = src[i] ^ (unsigned char)arcfour_byte(parc4ctx);
-}
-
-static int bcrc32initialized;
-static u32 crc32_table[256];
-
-static u8 crc32_reverseBit(u8 data)
-{
- return (u8)((data<<7)&0x80) | ((data<<5)&0x40) | ((data<<3)&0x20) |
- ((data<<1)&0x10) | ((data>>1)&0x08) | ((data>>3)&0x04) |
- ((data>>5)&0x02) | ((data>>7)&0x01);
-}
-
-static void crc32_init(void)
-{
- if (bcrc32initialized == 1) {
- return;
- } else {
- int i, j;
- u32 c;
- u8 *p = (u8 *)&c, *p1;
- u8 k;
-
- c = 0x12340000;
-
- for (i = 0; i < 256; ++i) {
- k = crc32_reverseBit((u8)i);
- for (c = ((u32)k) << 24, j = 8; j > 0; --j)
- c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY : (c << 1);
- p1 = (u8 *)&crc32_table[i];
-
- p1[0] = crc32_reverseBit(p[3]);
- p1[1] = crc32_reverseBit(p[2]);
- p1[2] = crc32_reverseBit(p[1]);
- p1[3] = crc32_reverseBit(p[0]);
- }
- bcrc32initialized = 1;
- }
-}
-
-static __le32 getcrc32(u8 *buf, int len)
-{
- u8 *p;
- u32 crc;
-
- if (bcrc32initialized == 0)
- crc32_init();
-
- crc = 0xffffffff; /* preload shift register, per CRC-32 spec */
-
- for (p = buf; len > 0; ++p, --len)
- crc = crc32_table[(crc ^ *p) & 0xff] ^ (crc >> 8);
- return cpu_to_le32(~crc); /* transmit complement, per CRC-32 spec */
-}
-
/*
Need to consider the fragment situation
*/
@@ -395,202 +280,24 @@ void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len, u8 *mic_cod
#define P1K_SIZE 10 /* 80-bit Phase1 key */
#define RC4_KEY_SIZE 16 /* 128-bit RC4KEY (104 bits unknown) */
-/* 2-unsigned char by 2-unsigned char subset of the full AES S-box table */
-static const unsigned short Sbox1[2][256] = { /* Sbox for hash (can be in ROM) */
-{
- 0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,
- 0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,
- 0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,
- 0x41EC, 0xB367, 0x5FFD, 0x45EA, 0x23BF, 0x53F7, 0xE496, 0x9B5B,
- 0x75C2, 0xE11C, 0x3DAE, 0x4C6A, 0x6C5A, 0x7E41, 0xF502, 0x834F,
- 0x685C, 0x51F4, 0xD134, 0xF908, 0xE293, 0xAB73, 0x6253, 0x2A3F,
- 0x080C, 0x9552, 0x4665, 0x9D5E, 0x3028, 0x37A1, 0x0A0F, 0x2FB5,
- 0x0E09, 0x2436, 0x1B9B, 0xDF3D, 0xCD26, 0x4E69, 0x7FCD, 0xEA9F,
- 0x121B, 0x1D9E, 0x5874, 0x342E, 0x362D, 0xDCB2, 0xB4EE, 0x5BFB,
- 0xA4F6, 0x764D, 0xB761, 0x7DCE, 0x527B, 0xDD3E, 0x5E71, 0x1397,
- 0xA6F5, 0xB968, 0x0000, 0xC12C, 0x4060, 0xE31F, 0x79C8, 0xB6ED,
- 0xD4BE, 0x8D46, 0x67D9, 0x724B, 0x94DE, 0x98D4, 0xB0E8, 0x854A,
- 0xBB6B, 0xC52A, 0x4FE5, 0xED16, 0x86C5, 0x9AD7, 0x6655, 0x1194,
- 0x8ACF, 0xE910, 0x0406, 0xFE81, 0xA0F0, 0x7844, 0x25BA, 0x4BE3,
- 0xA2F3, 0x5DFE, 0x80C0, 0x058A, 0x3FAD, 0x21BC, 0x7048, 0xF104,
- 0x63DF, 0x77C1, 0xAF75, 0x4263, 0x2030, 0xE51A, 0xFD0E, 0xBF6D,
- 0x814C, 0x1814, 0x2635, 0xC32F, 0xBEE1, 0x35A2, 0x88CC, 0x2E39,
- 0x9357, 0x55F2, 0xFC82, 0x7A47, 0xC8AC, 0xBAE7, 0x322B, 0xE695,
- 0xC0A0, 0x1998, 0x9ED1, 0xA37F, 0x4466, 0x547E, 0x3BAB, 0x0B83,
- 0x8CCA, 0xC729, 0x6BD3, 0x283C, 0xA779, 0xBCE2, 0x161D, 0xAD76,
- 0xDB3B, 0x6456, 0x744E, 0x141E, 0x92DB, 0x0C0A, 0x486C, 0xB8E4,
- 0x9F5D, 0xBD6E, 0x43EF, 0xC4A6, 0x39A8, 0x31A4, 0xD337, 0xF28B,
- 0xD532, 0x8B43, 0x6E59, 0xDAB7, 0x018C, 0xB164, 0x9CD2, 0x49E0,
- 0xD8B4, 0xACFA, 0xF307, 0xCF25, 0xCAAF, 0xF48E, 0x47E9, 0x1018,
- 0x6FD5, 0xF088, 0x4A6F, 0x5C72, 0x3824, 0x57F1, 0x73C7, 0x9751,
- 0xCB23, 0xA17C, 0xE89C, 0x3E21, 0x96DD, 0x61DC, 0x0D86, 0x0F85,
- 0xE090, 0x7C42, 0x71C4, 0xCCAA, 0x90D8, 0x0605, 0xF701, 0x1C12,
- 0xC2A3, 0x6A5F, 0xAEF9, 0x69D0, 0x1791, 0x9958, 0x3A27, 0x27B9,
- 0xD938, 0xEB13, 0x2BB3, 0x2233, 0xD2BB, 0xA970, 0x0789, 0x33A7,
- 0x2DB6, 0x3C22, 0x1592, 0xC920, 0x8749, 0xAAFF, 0x5078, 0xA57A,
- 0x038F, 0x59F8, 0x0980, 0x1A17, 0x65DA, 0xD731, 0x84C6, 0xD0B8,
- 0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A,
- },
-
- { /* second half of table is unsigned char-reversed version of first! */
- 0xA5C6, 0x84F8, 0x99EE, 0x8DF6, 0x0DFF, 0xBDD6, 0xB1DE, 0x5491,
- 0x5060, 0x0302, 0xA9CE, 0x7D56, 0x19E7, 0x62B5, 0xE64D, 0x9AEC,
- 0x458F, 0x9D1F, 0x4089, 0x87FA, 0x15EF, 0xEBB2, 0xC98E, 0x0BFB,
- 0xEC41, 0x67B3, 0xFD5F, 0xEA45, 0xBF23, 0xF753, 0x96E4, 0x5B9B,
- 0xC275, 0x1CE1, 0xAE3D, 0x6A4C, 0x5A6C, 0x417E, 0x02F5, 0x4F83,
- 0x5C68, 0xF451, 0x34D1, 0x08F9, 0x93E2, 0x73AB, 0x5362, 0x3F2A,
- 0x0C08, 0x5295, 0x6546, 0x5E9D, 0x2830, 0xA137, 0x0F0A, 0xB52F,
- 0x090E, 0x3624, 0x9B1B, 0x3DDF, 0x26CD, 0x694E, 0xCD7F, 0x9FEA,
- 0x1B12, 0x9E1D, 0x7458, 0x2E34, 0x2D36, 0xB2DC, 0xEEB4, 0xFB5B,
- 0xF6A4, 0x4D76, 0x61B7, 0xCE7D, 0x7B52, 0x3EDD, 0x715E, 0x9713,
- 0xF5A6, 0x68B9, 0x0000, 0x2CC1, 0x6040, 0x1FE3, 0xC879, 0xEDB6,
- 0xBED4, 0x468D, 0xD967, 0x4B72, 0xDE94, 0xD498, 0xE8B0, 0x4A85,
- 0x6BBB, 0x2AC5, 0xE54F, 0x16ED, 0xC586, 0xD79A, 0x5566, 0x9411,
- 0xCF8A, 0x10E9, 0x0604, 0x81FE, 0xF0A0, 0x4478, 0xBA25, 0xE34B,
- 0xF3A2, 0xFE5D, 0xC080, 0x8A05, 0xAD3F, 0xBC21, 0x4870, 0x04F1,
- 0xDF63, 0xC177, 0x75AF, 0x6342, 0x3020, 0x1AE5, 0x0EFD, 0x6DBF,
- 0x4C81, 0x1418, 0x3526, 0x2FC3, 0xE1BE, 0xA235, 0xCC88, 0x392E,
- 0x5793, 0xF255, 0x82FC, 0x477A, 0xACC8, 0xE7BA, 0x2B32, 0x95E6,
- 0xA0C0, 0x9819, 0xD19E, 0x7FA3, 0x6644, 0x7E54, 0xAB3B, 0x830B,
- 0xCA8C, 0x29C7, 0xD36B, 0x3C28, 0x79A7, 0xE2BC, 0x1D16, 0x76AD,
- 0x3BDB, 0x5664, 0x4E74, 0x1E14, 0xDB92, 0x0A0C, 0x6C48, 0xE4B8,
- 0x5D9F, 0x6EBD, 0xEF43, 0xA6C4, 0xA839, 0xA431, 0x37D3, 0x8BF2,
- 0x32D5, 0x438B, 0x596E, 0xB7DA, 0x8C01, 0x64B1, 0xD29C, 0xE049,
- 0xB4D8, 0xFAAC, 0x07F3, 0x25CF, 0xAFCA, 0x8EF4, 0xE947, 0x1810,
- 0xD56F, 0x88F0, 0x6F4A, 0x725C, 0x2438, 0xF157, 0xC773, 0x5197,
- 0x23CB, 0x7CA1, 0x9CE8, 0x213E, 0xDD96, 0xDC61, 0x860D, 0x850F,
- 0x90E0, 0x427C, 0xC471, 0xAACC, 0xD890, 0x0506, 0x01F7, 0x121C,
- 0xA3C2, 0x5F6A, 0xF9AE, 0xD069, 0x9117, 0x5899, 0x273A, 0xB927,
- 0x38D9, 0x13EB, 0xB32B, 0x3322, 0xBBD2, 0x70A9, 0x8907, 0xA733,
- 0xB62D, 0x223C, 0x9215, 0x20C9, 0x4987, 0xFFAA, 0x7850, 0x7AA5,
- 0x8F03, 0xF859, 0x8009, 0x171A, 0xDA65, 0x31D7, 0xC684, 0xB8D0,
- 0xC382, 0xB029, 0x775A, 0x111E, 0xCB7B, 0xFCA8, 0xD66D, 0x3A2C,
- }
-};
-
- /*
-**********************************************************************
-* Routine: Phase 1 -- generate P1K, given TA, TK, IV32
-*
-* Inputs:
-* tk[] = temporal key [128 bits]
-* ta[] = transmitter's MAC address [ 48 bits]
-* iv32 = upper 32 bits of IV [ 32 bits]
-* Output:
-* p1k[] = Phase 1 key [ 80 bits]
-*
-* Note:
-* This function only needs to be called every 2**16 packets,
-* although in theory it could be called every packet.
-*
-**********************************************************************
-*/
-static void phase1(u16 *p1k, const u8 *tk, const u8 *ta, u32 iv32)
-{
- int i;
- /* Initialize the 80 bits of P1K[] from IV32 and TA[0..5] */
- p1k[0] = Lo16(iv32);
- p1k[1] = Hi16(iv32);
- p1k[2] = Mk16(ta[1], ta[0]); /* use TA[] as little-endian */
- p1k[3] = Mk16(ta[3], ta[2]);
- p1k[4] = Mk16(ta[5], ta[4]);
-
- /* Now compute an unbalanced Feistel cipher with 80-bit block */
- /* size on the 80-bit block P1K[], using the 128-bit key TK[] */
- for (i = 0; i < PHASE1_LOOP_CNT; i++) { /* Each add operation here is mod 2**16 */
- p1k[0] += _S_(p1k[4] ^ TK16((i&1)+0));
- p1k[1] += _S_(p1k[0] ^ TK16((i&1)+2));
- p1k[2] += _S_(p1k[1] ^ TK16((i&1)+4));
- p1k[3] += _S_(p1k[2] ^ TK16((i&1)+6));
- p1k[4] += _S_(p1k[3] ^ TK16((i&1)+0));
- p1k[4] += (unsigned short)i; /* avoid "slide attacks" */
- }
-}
-
-/*
-**********************************************************************
-* Routine: Phase 2 -- generate RC4KEY, given TK, P1K, IV16
-*
-* Inputs:
-* tk[] = Temporal key [128 bits]
-* p1k[] = Phase 1 output key [ 80 bits]
-* iv16 = low 16 bits of IV counter [ 16 bits]
-* Output:
-* rc4key[] = the key used to encrypt the packet [128 bits]
-*
-* Note:
-* The value {TA, IV32, IV16} for Phase1/Phase2 must be unique
-* across all packets using the same key TK value. Then, for a
-* given value of TK[], this TKIP48 construction guarantees that
-* the final RC4KEY value is unique across all packets.
-*
-* Suggested implementation optimization: if PPK[] is "overlaid"
-* appropriately on RC4KEY[], there is no need for the final
-* for loop below that copies the PPK[] result into RC4KEY[].
-*
-**********************************************************************
-*/
-static void phase2(u8 *rc4key, const u8 *tk, const u16 *p1k, u16 iv16)
-{
- int i;
- u16 PPK[6]; /* temporary key for mixing */
- /* Note: all adds in the PPK[] equations below are mod 2**16 */
- for (i = 0; i < 5; i++)
- PPK[i] = p1k[i]; /* first, copy P1K to PPK */
- PPK[5] = p1k[4] + iv16; /* next, add in IV16 */
-
- /* Bijective non-linear mixing of the 96 bits of PPK[0..5] */
- PPK[0] += _S_(PPK[5] ^ TK16(0)); /* Mix key in each "round" */
- PPK[1] += _S_(PPK[0] ^ TK16(1));
- PPK[2] += _S_(PPK[1] ^ TK16(2));
- PPK[3] += _S_(PPK[2] ^ TK16(3));
- PPK[4] += _S_(PPK[3] ^ TK16(4));
- PPK[5] += _S_(PPK[4] ^ TK16(5)); /* Total # S-box lookups == 6 */
-
- /* Final sweep: bijective, "linear". Rotates kill LSB correlations */
- PPK[0] += RotR1(PPK[5] ^ TK16(6));
- PPK[1] += RotR1(PPK[0] ^ TK16(7)); /* Use all of TK[] in Phase2 */
- PPK[2] += RotR1(PPK[1]);
- PPK[3] += RotR1(PPK[2]);
- PPK[4] += RotR1(PPK[3]);
- PPK[5] += RotR1(PPK[4]);
- /* Note: At this point, for a given key TK[0..15], the 96-bit output */
- /* value PPK[0..5] is guaranteed to be unique, as a function */
- /* of the 96-bit "input" value {TA, IV32, IV16}. That is, P1K */
- /* is now a keyed permutation of {TA, IV32, IV16}. */
-
- /* Set RC4KEY[0..3], which includes "cleartext" portion of RC4 key */
- rc4key[0] = Hi8(iv16); /* RC4KEY[0..2] is the WEP IV */
- rc4key[1] = (Hi8(iv16) | 0x20) & 0x7F; /* Help avoid weak (FMS) keys */
- rc4key[2] = Lo8(iv16);
- rc4key[3] = Lo8((PPK[5] ^ TK16(0)) >> 1);
-
- /* Copy 96 bits of PPK[0..5] to RC4KEY[4..15] (little-endian) */
- for (i = 0; i < 6; i++) {
- rc4key[4+2*i] = Lo8(PPK[i]);
- rc4key[5+2*i] = Hi8(PPK[i]);
- }
-}
-
/* The hlen isn't include the IV */
u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
-{ /* exclude ICV */
- u16 pnl;
- u32 pnh;
- u8 rc4key[16];
- u8 ttkey[16];
- u8 crc[4];
+{
u8 hw_hdr_offset = 0;
- struct arc4context mycontext;
int curfragnum, length;
- u8 *pframe, *payload, *iv, *prwskey;
- union pn48 dot11txpn;
+ u8 *pframe;
struct sta_info *stainfo;
struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib;
struct security_priv *psecuritypriv = &padapter->securitypriv;
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
u32 res = _SUCCESS;
+ void *crypto_private;
+ struct sk_buff *skb;
+ u8 key[32];
+ int key_idx;
+ const int key_length = 32;
+ struct lib80211_crypto_ops *crypto_ops;
if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
return _FAIL;
@@ -599,57 +306,85 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
(((struct xmit_frame *)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ);
pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
/* 4 start to encrypt each fragment */
- if (pattrib->encrypt == _TKIP_) {
- if (pattrib->psta)
- stainfo = pattrib->psta;
- else
- stainfo = rtw_get_stainfo(&padapter->stapriv, &pattrib->ra[0]);
+ if (pattrib->encrypt != _TKIP_)
+ return res;
- if (stainfo != NULL) {
- RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
+ if (pattrib->psta)
+ stainfo = pattrib->psta;
+ else
+ stainfo = rtw_get_stainfo(&padapter->stapriv, &pattrib->ra[0]);
- if (IS_MCAST(pattrib->ra))
- prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
- else
- prwskey = &stainfo->dot118021x_UncstKey.skey[0];
+ if (!stainfo) {
+ RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo==NULL!!!\n", __func__));
+ return _FAIL;
+ }
- for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
- iv = pframe+pattrib->hdrlen;
- payload = pframe+pattrib->iv_len+pattrib->hdrlen;
+ crypto_ops = try_then_request_module(lib80211_get_crypto_ops("TKIP"), "lib80211_crypt_tkip");
- GET_TKIP_PN(iv, dot11txpn);
+ if (IS_MCAST(pattrib->ra)) {
+ key_idx = psecuritypriv->dot118021XGrpKeyid;
+ memcpy(key, psecuritypriv->dot118021XGrpKey[key_idx].skey, 16);
+ memcpy(key + 16, psecuritypriv->dot118021XGrptxmickey[key_idx].skey, 16);
+ } else {
+ key_idx = 0;
+ memcpy(key, stainfo->dot118021x_UncstKey.skey, 16);
+ memcpy(key + 16, stainfo->dot11tkiptxmickey.skey, 16);
+ }
- pnl = (u16)(dot11txpn.val);
- pnh = (u32)(dot11txpn.val>>16);
- phase1((u16 *)&ttkey[0], prwskey, &pattrib->ta[0], pnh);
- phase2(&rc4key[0], prwskey, (u16 *)&ttkey[0], pnl);
+ if (!crypto_ops) {
+ res = _FAIL;
+ goto exit;
+ }
- if ((curfragnum+1) == pattrib->nr_frags) { /* 4 the last fragment */
- length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
- RT_TRACE(_module_rtl871x_security_c_, _drv_info_,
- ("pattrib->iv_len=%x, pattrib->icv_len=%x\n",
- pattrib->iv_len, pattrib->icv_len));
- *((__le32 *)crc) = getcrc32(payload, length);/* modified by Amy*/
-
- arcfour_init(&mycontext, rc4key, 16);
- arcfour_encrypt(&mycontext, payload, payload, length);
- arcfour_encrypt(&mycontext, payload+length, crc, 4);
- } else {
- length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
- *((__le32 *)crc) = getcrc32(payload, length);/* modified by Amy*/
- arcfour_init(&mycontext, rc4key, 16);
- arcfour_encrypt(&mycontext, payload, payload, length);
- arcfour_encrypt(&mycontext, payload+length, crc, 4);
+ crypto_private = crypto_ops->init(key_idx);
+ if (!crypto_private) {
+ res = _FAIL;
+ goto exit;
+ }
- pframe += pxmitpriv->frag_len;
- pframe = (u8 *)round_up((size_t)(pframe), 4);
- }
- }
- } else {
- RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo==NULL!!!\n", __func__));
+ if (crypto_ops->set_key(key, key_length, NULL, crypto_private) < 0) {
+ res = _FAIL;
+ goto exit_crypto_ops_deinit;
+ }
+
+ RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
+
+ for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
+ if ((curfragnum+1) == pattrib->nr_frags)
+ length = pattrib->last_txcmdsz;
+ else
+ length = pxmitpriv->frag_len;
+
+ skb = dev_alloc_skb(length);
+ if (!skb) {
+ res = _FAIL;
+ goto exit_crypto_ops_deinit;
+ }
+
+ skb_put_data(skb, pframe, length);
+
+ memmove(skb->data + pattrib->iv_len, skb->data, pattrib->hdrlen);
+ skb_pull(skb, pattrib->iv_len);
+ skb_trim(skb, skb->len - pattrib->icv_len);
+
+ if (crypto_ops->encrypt_mpdu(skb, pattrib->hdrlen, crypto_private)) {
+ kfree_skb(skb);
res = _FAIL;
+ goto exit_crypto_ops_deinit;
}
+
+ memcpy(pframe, skb->data, skb->len);
+
+ pframe += skb->len;
+ pframe = (u8 *)round_up((size_t)(pframe), 4);
+
+ kfree_skb(skb);
}
+
+exit_crypto_ops_deinit:
+ crypto_ops->deinit(crypto_private);
+
+exit:
return res;
}
--
2.16.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] staging:r8188eu: Use lib80211 to encrypt (CCMP) tx frames
2018-07-14 17:54 [PATCH 1/2] staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames Ivan Safonov
@ 2018-07-14 17:54 ` Ivan Safonov
2018-07-16 13:30 ` Michael Straube
0 siblings, 1 reply; 6+ messages in thread
From: Ivan Safonov @ 2018-07-14 17:54 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Santha Meena Ramamoorthy, Michael Straube, Janani Sankara Babu,
devel, linux-kernel, Ivan Safonov
Put data to skb, decrypt with lib80211_crypt_ccmp, and place back to tx buffer.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_security.c | 778 +++-----------------------
1 file changed, 72 insertions(+), 706 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_security.c b/drivers/staging/rtl8188eu/core/rtw_security.c
index ada69efd61b3..508d3299b4e9 100644
--- a/drivers/staging/rtl8188eu/core/rtw_security.c
+++ b/drivers/staging/rtl8188eu/core/rtw_security.c
@@ -462,554 +462,107 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
return res;
}
-/* 3 ===== AES related ===== */
-
-
-#define MAX_MSG_SIZE 2048
-/*****************************/
-/******** SBOX Table *********/
-/*****************************/
-
-static u8 sbox_table[256] = {
- 0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
- 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
- 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
- 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
- 0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
- 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
- 0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
- 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
- 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
- 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
- 0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
- 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
- 0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
- 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
- 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
- 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
- 0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
- 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
- 0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
- 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
- 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
- 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
- 0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
- 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
- 0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
- 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
- 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
- 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
- 0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
- 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
- 0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
- 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
-};
-
-/*****************************/
-/**** Function Prototypes ****/
-/*****************************/
-
-static void bitwise_xor(u8 *ina, u8 *inb, u8 *out);
-static void construct_mic_iv(u8 *mic_header1, int qc_exists, int a4_exists, u8 *mpdu, uint payload_length, u8 *pn_vector);
-static void construct_mic_header1(u8 *mic_header1, int header_length, u8 *mpdu);
-static void construct_mic_header2(u8 *mic_header2, u8 *mpdu, int a4_exists, int qc_exists);
-static void construct_ctr_preload(u8 *ctr_preload, int a4_exists, int qc_exists, u8 *mpdu, u8 *pn_vector, int c);
-static void xor_128(u8 *a, u8 *b, u8 *out);
-static void xor_32(u8 *a, u8 *b, u8 *out);
-static u8 sbox(u8 a);
-static void next_key(u8 *key, int round);
-static void byte_sub(u8 *in, u8 *out);
-static void shift_row(u8 *in, u8 *out);
-static void mix_column(u8 *in, u8 *out);
-static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext);
-
-/****************************************/
-/* aes128k128d() */
-/* Performs a 128 bit AES encrypt with */
-/* 128 bit data. */
-/****************************************/
-static void xor_128(u8 *a, u8 *b, u8 *out)
-{
- int i;
-
- for (i = 0; i < 16; i++)
- out[i] = a[i] ^ b[i];
-}
-
-static void xor_32(u8 *a, u8 *b, u8 *out)
-{
- int i;
-
- for (i = 0; i < 4; i++)
- out[i] = a[i] ^ b[i];
-}
-
-static u8 sbox(u8 a)
-{
- return sbox_table[(int)a];
-}
-
-static void next_key(u8 *key, int round)
-{
- u8 rcon;
- u8 sbox_key[4];
- u8 rcon_table[12] = {
- 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
- 0x1b, 0x36, 0x36, 0x36
- };
-
- sbox_key[0] = sbox(key[13]);
- sbox_key[1] = sbox(key[14]);
- sbox_key[2] = sbox(key[15]);
- sbox_key[3] = sbox(key[12]);
-
- rcon = rcon_table[round];
-
- xor_32(&key[0], sbox_key, &key[0]);
- key[0] = key[0] ^ rcon;
-
- xor_32(&key[4], &key[0], &key[4]);
- xor_32(&key[8], &key[4], &key[8]);
- xor_32(&key[12], &key[8], &key[12]);
-}
-
-static void byte_sub(u8 *in, u8 *out)
-{
- int i;
- for (i = 0; i < 16; i++)
- out[i] = sbox(in[i]);
-}
-
-static void shift_row(u8 *in, u8 *out)
-{
- out[0] = in[0];
- out[1] = in[5];
- out[2] = in[10];
- out[3] = in[15];
- out[4] = in[4];
- out[5] = in[9];
- out[6] = in[14];
- out[7] = in[3];
- out[8] = in[8];
- out[9] = in[13];
- out[10] = in[2];
- out[11] = in[7];
- out[12] = in[12];
- out[13] = in[1];
- out[14] = in[6];
- out[15] = in[11];
-}
-
-static void mix_column(u8 *in, u8 *out)
-{
- int i;
- u8 add1b[4];
- u8 add1bf7[4];
- u8 rotl[4];
- u8 swap_halves[4];
- u8 andf7[4];
- u8 rotr[4];
- u8 temp[4];
- u8 tempb[4];
-
- for (i = 0 ; i < 4; i++) {
- if ((in[i] & 0x80) == 0x80)
- add1b[i] = 0x1b;
- else
- add1b[i] = 0x00;
- }
-
- swap_halves[0] = in[2]; /* Swap halves */
- swap_halves[1] = in[3];
- swap_halves[2] = in[0];
- swap_halves[3] = in[1];
-
- rotl[0] = in[3]; /* Rotate left 8 bits */
- rotl[1] = in[0];
- rotl[2] = in[1];
- rotl[3] = in[2];
-
- andf7[0] = in[0] & 0x7f;
- andf7[1] = in[1] & 0x7f;
- andf7[2] = in[2] & 0x7f;
- andf7[3] = in[3] & 0x7f;
-
- for (i = 3; i > 0; i--) { /* logical shift left 1 bit */
- andf7[i] = andf7[i] << 1;
- if ((andf7[i-1] & 0x80) == 0x80)
- andf7[i] = (andf7[i] | 0x01);
- }
- andf7[0] = andf7[0] << 1;
- andf7[0] = andf7[0] & 0xfe;
-
- xor_32(add1b, andf7, add1bf7);
-
- xor_32(in, add1bf7, rotr);
-
- temp[0] = rotr[0]; /* Rotate right 8 bits */
- rotr[0] = rotr[1];
- rotr[1] = rotr[2];
- rotr[2] = rotr[3];
- rotr[3] = temp[0];
-
- xor_32(add1bf7, rotr, temp);
- xor_32(swap_halves, rotl, tempb);
- xor_32(temp, tempb, out);
-}
-
-static void aes128k128d(u8 *key, u8 *data, u8 *ciphertext)
-{
- int round;
- int i;
- u8 intermediatea[16];
- u8 intermediateb[16];
- u8 round_key[16];
-
- for (i = 0; i < 16; i++)
- round_key[i] = key[i];
- for (round = 0; round < 11; round++) {
- if (round == 0) {
- xor_128(round_key, data, ciphertext);
- next_key(round_key, round);
- } else if (round == 10) {
- byte_sub(ciphertext, intermediatea);
- shift_row(intermediatea, intermediateb);
- xor_128(intermediateb, round_key, ciphertext);
- } else { /* 1 - 9 */
- byte_sub(ciphertext, intermediatea);
- shift_row(intermediatea, intermediateb);
- mix_column(&intermediateb[0], &intermediatea[0]);
- mix_column(&intermediateb[4], &intermediatea[4]);
- mix_column(&intermediateb[8], &intermediatea[8]);
- mix_column(&intermediateb[12], &intermediatea[12]);
- xor_128(intermediatea, round_key, ciphertext);
- next_key(round_key, round);
- }
- }
-}
-
-/************************************************/
-/* construct_mic_iv() */
-/* Builds the MIC IV from header fields and PN */
-/************************************************/
-static void construct_mic_iv(u8 *mic_iv, int qc_exists, int a4_exists, u8 *mpdu,
- uint payload_length, u8 *pn_vector)
-{
- int i;
-
- mic_iv[0] = 0x59;
- if (qc_exists && a4_exists)
- mic_iv[1] = mpdu[30] & 0x0f; /* QoS_TC */
- if (qc_exists && !a4_exists)
- mic_iv[1] = mpdu[24] & 0x0f; /* mute bits 7-4 */
- if (!qc_exists)
- mic_iv[1] = 0x00;
- for (i = 2; i < 8; i++)
- mic_iv[i] = mpdu[i + 8]; /* mic_iv[2:7] = A2[0:5] = mpdu[10:15] */
- for (i = 8; i < 14; i++)
- mic_iv[i] = pn_vector[13 - i]; /* mic_iv[8:13] = PN[5:0] */
- mic_iv[14] = (unsigned char)(payload_length / 256);
- mic_iv[15] = (unsigned char)(payload_length % 256);
-}
-
-/************************************************/
-/* construct_mic_header1() */
-/* Builds the first MIC header block from */
-/* header fields. */
-/************************************************/
-static void construct_mic_header1(u8 *mic_header1, int header_length, u8 *mpdu)
-{
- mic_header1[0] = (u8)((header_length - 2) / 256);
- mic_header1[1] = (u8)((header_length - 2) % 256);
- mic_header1[2] = mpdu[0] & 0xcf; /* Mute CF poll & CF ack bits */
- mic_header1[3] = mpdu[1] & 0xc7; /* Mute retry, more data and pwr mgt bits */
- mic_header1[4] = mpdu[4]; /* A1 */
- mic_header1[5] = mpdu[5];
- mic_header1[6] = mpdu[6];
- mic_header1[7] = mpdu[7];
- mic_header1[8] = mpdu[8];
- mic_header1[9] = mpdu[9];
- mic_header1[10] = mpdu[10]; /* A2 */
- mic_header1[11] = mpdu[11];
- mic_header1[12] = mpdu[12];
- mic_header1[13] = mpdu[13];
- mic_header1[14] = mpdu[14];
- mic_header1[15] = mpdu[15];
-}
-
-/************************************************/
-/* construct_mic_header2() */
-/* Builds the last MIC header block from */
-/* header fields. */
-/************************************************/
-static void construct_mic_header2(u8 *mic_header2, u8 *mpdu, int a4_exists, int qc_exists)
+u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
{
- int i;
-
- for (i = 0; i < 16; i++)
- mic_header2[i] = 0x00;
+ int curfragnum, length;
+ u8 *pframe; /* *payload,*iv */
+ u8 hw_hdr_offset = 0;
+ struct sta_info *stainfo;
+ struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib;
+ struct security_priv *psecuritypriv = &padapter->securitypriv;
+ struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
+ u32 res = _SUCCESS;
+ void *crypto_private;
+ struct sk_buff *skb;
+ struct lib80211_crypto_ops *crypto_ops;
+ const int key_idx = IS_MCAST(pattrib->ra) ? psecuritypriv->dot118021XGrpKeyid : 0;
+ const int key_length = 16;
+ u8 *key;
- mic_header2[0] = mpdu[16]; /* A3 */
- mic_header2[1] = mpdu[17];
- mic_header2[2] = mpdu[18];
- mic_header2[3] = mpdu[19];
- mic_header2[4] = mpdu[20];
- mic_header2[5] = mpdu[21];
+ if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
+ return _FAIL;
- mic_header2[6] = 0x00;
- mic_header2[7] = 0x00; /* mpdu[23]; */
+ hw_hdr_offset = TXDESC_SIZE +
+ (((struct xmit_frame *)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ);
- if (!qc_exists && a4_exists) {
- for (i = 0; i < 6; i++)
- mic_header2[8+i] = mpdu[24+i]; /* A4 */
- }
+ pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
- if (qc_exists && !a4_exists) {
- mic_header2[8] = mpdu[24] & 0x0f; /* mute bits 15 - 4 */
- mic_header2[9] = mpdu[25] & 0x00;
- }
+ /* 4 start to encrypt each fragment */
+ if (pattrib->encrypt != _AES_)
+ return res;
- if (qc_exists && a4_exists) {
- for (i = 0; i < 6; i++)
- mic_header2[8+i] = mpdu[24+i]; /* A4 */
+ if (pattrib->psta)
+ stainfo = pattrib->psta;
+ else
+ stainfo = rtw_get_stainfo(&padapter->stapriv, &pattrib->ra[0]);
- mic_header2[14] = mpdu[30] & 0x0f;
- mic_header2[15] = mpdu[31] & 0x00;
+ if (!stainfo) {
+ RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo==NULL!!!\n", __func__));
+ return _FAIL;
}
-}
-/************************************************/
-/* construct_mic_header2() */
-/* Builds the last MIC header block from */
-/* header fields. */
-/************************************************/
-static void construct_ctr_preload(u8 *ctr_preload, int a4_exists, int qc_exists, u8 *mpdu, u8 *pn_vector, int c)
-{
- int i;
-
- for (i = 0; i < 16; i++)
- ctr_preload[i] = 0x00;
- i = 0;
-
- ctr_preload[0] = 0x01; /* flag */
- if (qc_exists && a4_exists)
- ctr_preload[1] = mpdu[30] & 0x0f; /* QoC_Control */
- if (qc_exists && !a4_exists)
- ctr_preload[1] = mpdu[24] & 0x0f;
-
- for (i = 2; i < 8; i++)
- ctr_preload[i] = mpdu[i + 8]; /* ctr_preload[2:7] = A2[0:5] = mpdu[10:15] */
- for (i = 8; i < 14; i++)
- ctr_preload[i] = pn_vector[13 - i]; /* ctr_preload[8:13] = PN[5:0] */
- ctr_preload[14] = (unsigned char)(c / 256); /* Ctr */
- ctr_preload[15] = (unsigned char)(c % 256);
-}
-
-/************************************/
-/* bitwise_xor() */
-/* A 128 bit, bitwise exclusive or */
-/************************************/
-static void bitwise_xor(u8 *ina, u8 *inb, u8 *out)
-{
- int i;
+ crypto_ops = try_then_request_module(lib80211_get_crypto_ops("CCMP"), "lib80211_crypt_ccmp");
- for (i = 0; i < 16; i++)
- out[i] = ina[i] ^ inb[i];
-}
-
-static int aes_cipher(u8 *key, uint hdrlen, u8 *pframe, uint plen)
-{
- uint qc_exists, a4_exists, i, j, payload_remainder,
- num_blocks, payload_index;
-
- u8 pn_vector[6];
- u8 mic_iv[16];
- u8 mic_header1[16];
- u8 mic_header2[16];
- u8 ctr_preload[16];
-
- /* Intermediate Buffers */
- u8 chain_buffer[16];
- u8 aes_out[16];
- u8 padded_buffer[16];
- u8 mic[8];
- uint frtype = GetFrameType(pframe);
- uint frsubtype = GetFrameSubType(pframe);
-
- frsubtype >>= 4;
-
- memset(mic_iv, 0, 16);
- memset(mic_header1, 0, 16);
- memset(mic_header2, 0, 16);
- memset(ctr_preload, 0, 16);
- memset(chain_buffer, 0, 16);
- memset(aes_out, 0, 16);
- memset(padded_buffer, 0, 16);
-
- if ((hdrlen == WLAN_HDR_A3_LEN) || (hdrlen == WLAN_HDR_A3_QOS_LEN))
- a4_exists = 0;
+ if (IS_MCAST(pattrib->ra))
+ key = psecuritypriv->dot118021XGrpKey[key_idx].skey;
else
- a4_exists = 1;
-
- if ((frtype == WIFI_DATA_CFACK) || (frtype == WIFI_DATA_CFPOLL) || (frtype == WIFI_DATA_CFACKPOLL)) {
- qc_exists = 1;
- if (hdrlen != WLAN_HDR_A3_QOS_LEN)
- hdrlen += 2;
- } else if ((frsubtype == 0x08) || (frsubtype == 0x09) || (frsubtype == 0x0a) || (frsubtype == 0x0b)) {
- if (hdrlen != WLAN_HDR_A3_QOS_LEN)
- hdrlen += 2;
- qc_exists = 1;
- } else {
- qc_exists = 0;
- }
-
- pn_vector[0] = pframe[hdrlen];
- pn_vector[1] = pframe[hdrlen+1];
- pn_vector[2] = pframe[hdrlen+4];
- pn_vector[3] = pframe[hdrlen+5];
- pn_vector[4] = pframe[hdrlen+6];
- pn_vector[5] = pframe[hdrlen+7];
-
- construct_mic_iv(mic_iv, qc_exists, a4_exists, pframe, plen, pn_vector);
-
- construct_mic_header1(mic_header1, hdrlen, pframe);
- construct_mic_header2(mic_header2, pframe, a4_exists, qc_exists);
-
- payload_remainder = plen % 16;
- num_blocks = plen / 16;
-
- /* Find start of payload */
- payload_index = hdrlen + 8;
-
- /* Calculate MIC */
- aes128k128d(key, mic_iv, aes_out);
- bitwise_xor(aes_out, mic_header1, chain_buffer);
- aes128k128d(key, chain_buffer, aes_out);
- bitwise_xor(aes_out, mic_header2, chain_buffer);
- aes128k128d(key, chain_buffer, aes_out);
+ key = stainfo->dot118021x_UncstKey.skey;
- for (i = 0; i < num_blocks; i++) {
- bitwise_xor(aes_out, &pframe[payload_index], chain_buffer);/* bitwise_xor(aes_out, &message[payload_index], chain_buffer); */
-
- payload_index += 16;
- aes128k128d(key, chain_buffer, aes_out);
- }
-
- /* Add on the final payload block if it needs padding */
- if (payload_remainder > 0) {
- for (j = 0; j < 16; j++)
- padded_buffer[j] = 0x00;
- for (j = 0; j < payload_remainder; j++)
- padded_buffer[j] = pframe[payload_index++];/* padded_buffer[j] = message[payload_index++]; */
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
- aes128k128d(key, chain_buffer, aes_out);
+ if (!crypto_ops) {
+ res = _FAIL;
+ goto exit;
}
- for (j = 0; j < 8; j++)
- mic[j] = aes_out[j];
-
- /* Insert MIC into payload */
- for (j = 0; j < 8; j++)
- pframe[payload_index+j] = mic[j];
-
- payload_index = hdrlen + 8;
- for (i = 0; i < num_blocks; i++) {
- construct_ctr_preload(ctr_preload, a4_exists, qc_exists, pframe, pn_vector, i+1);
- aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, &pframe[payload_index], chain_buffer);
- for (j = 0; j < 16; j++)
- pframe[payload_index++] = chain_buffer[j];
+ crypto_private = crypto_ops->init(key_idx);
+ if (!crypto_private) {
+ res = _FAIL;
+ goto exit;
}
- if (payload_remainder > 0) { /* If there is a short final block, then pad it,*/
- /* encrypt it and copy the unpadded part back */
- construct_ctr_preload(ctr_preload, a4_exists, qc_exists, pframe, pn_vector, num_blocks+1);
-
- for (j = 0; j < 16; j++)
- padded_buffer[j] = 0x00;
- for (j = 0; j < payload_remainder; j++)
- padded_buffer[j] = pframe[payload_index+j];
- aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
- for (j = 0; j < payload_remainder; j++)
- pframe[payload_index++] = chain_buffer[j];
+ if (crypto_ops->set_key(key, key_length, NULL, crypto_private) < 0) {
+ res = _FAIL;
+ goto exit_crypto_ops_deinit;
}
- /* Encrypt the MIC */
- construct_ctr_preload(ctr_preload, a4_exists, qc_exists, pframe, pn_vector, 0);
-
- for (j = 0; j < 16; j++)
- padded_buffer[j] = 0x00;
- for (j = 0; j < 8; j++)
- padded_buffer[j] = pframe[j+hdrlen+8+plen];
-
- aes128k128d(key, ctr_preload, aes_out);
- bitwise_xor(aes_out, padded_buffer, chain_buffer);
- for (j = 0; j < 8; j++)
- pframe[payload_index++] = chain_buffer[j];
- return _SUCCESS;
-}
-u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
-{ /* exclude ICV */
+ RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
- /*static*/
-/* unsigned char message[MAX_MSG_SIZE]; */
+ for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
+ if ((curfragnum+1) == pattrib->nr_frags)
+ length = pattrib->last_txcmdsz;
+ else
+ length = pxmitpriv->frag_len;
- /* Intermediate Buffers */
- int curfragnum, length;
- u8 *pframe, *prwskey; /* *payload,*iv */
- u8 hw_hdr_offset = 0;
- struct sta_info *stainfo;
- struct pkt_attrib *pattrib = &((struct xmit_frame *)pxmitframe)->attrib;
- struct security_priv *psecuritypriv = &padapter->securitypriv;
- struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
+ skb = dev_alloc_skb(length);
+ if (!skb) {
+ res = _FAIL;
+ goto exit_crypto_ops_deinit;
+ }
-/* uint offset = 0; */
- u32 res = _SUCCESS;
+ skb_put_data(skb, pframe, length);
- if (((struct xmit_frame *)pxmitframe)->buf_addr == NULL)
- return _FAIL;
+ memmove(skb->data + pattrib->iv_len, skb->data, pattrib->hdrlen);
+ skb_pull(skb, pattrib->iv_len);
+ skb_trim(skb, skb->len - pattrib->icv_len);
- hw_hdr_offset = TXDESC_SIZE +
- (((struct xmit_frame *)pxmitframe)->pkt_offset * PACKET_OFFSET_SZ);
+ if (crypto_ops->encrypt_mpdu(skb, pattrib->hdrlen, crypto_private)) {
+ kfree_skb(skb);
+ res = _FAIL;
+ goto exit_crypto_ops_deinit;
+ }
- pframe = ((struct xmit_frame *)pxmitframe)->buf_addr + hw_hdr_offset;
+ memcpy(pframe, skb->data, skb->len);
- /* 4 start to encrypt each fragment */
- if (pattrib->encrypt == _AES_) {
- if (pattrib->psta)
- stainfo = pattrib->psta;
- else
- stainfo = rtw_get_stainfo(&padapter->stapriv, &pattrib->ra[0]);
+ pframe += skb->len;
+ pframe = (u8 *)round_up((size_t)(pframe), 8);
- if (stainfo) {
- RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo!= NULL!!!\n", __func__));
-
- if (IS_MCAST(pattrib->ra))
- prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
- else
- prwskey = &stainfo->dot118021x_UncstKey.skey[0];
- for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
- if ((curfragnum+1) == pattrib->nr_frags) { /* 4 the last fragment */
- length = pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
-
- aes_cipher(prwskey, pattrib->hdrlen, pframe, length);
- } else{
- length = pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-pattrib->icv_len;
-
- aes_cipher(prwskey, pattrib->hdrlen, pframe, length);
- pframe += pxmitpriv->frag_len;
- pframe = (u8 *)round_up((size_t)(pframe), 8);
- }
- }
- } else{
- RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("%s: stainfo==NULL!!!\n", __func__));
- res = _FAIL;
- }
+ kfree_skb(skb);
}
+exit_crypto_ops_deinit:
+ crypto_ops->deinit(crypto_private);
- return res;
+exit:
+ return res;
}
u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
@@ -1085,190 +638,3 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
exit:
return res;
}
-
-/* AES tables*/
-const u32 Te0[256] = {
- 0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
- 0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
- 0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
- 0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
- 0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
- 0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
- 0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
- 0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
- 0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
- 0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
- 0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
- 0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
- 0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
- 0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
- 0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
- 0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
- 0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
- 0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
- 0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
- 0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
- 0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
- 0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
- 0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
- 0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
- 0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
- 0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
- 0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
- 0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
- 0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
- 0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
- 0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
- 0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
- 0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
- 0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
- 0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
- 0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
- 0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
- 0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
- 0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
- 0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
- 0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
- 0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
- 0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
- 0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
- 0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
- 0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
- 0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
- 0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
- 0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
- 0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
- 0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
- 0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
- 0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
- 0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
- 0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
- 0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
- 0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
- 0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
- 0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
- 0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
- 0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
- 0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
- 0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
- 0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
-};
-
-const u32 Td0[256] = {
- 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
- 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
- 0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
- 0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
- 0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
- 0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
- 0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
- 0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
- 0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
- 0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
- 0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
- 0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
- 0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
- 0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
- 0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
- 0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
- 0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
- 0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
- 0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
- 0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
- 0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
- 0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
- 0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
- 0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
- 0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
- 0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
- 0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
- 0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
- 0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
- 0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
- 0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
- 0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
- 0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
- 0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
- 0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
- 0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
- 0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
- 0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
- 0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
- 0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
- 0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
- 0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
- 0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
- 0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
- 0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
- 0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
- 0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
- 0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
- 0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
- 0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
- 0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
- 0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
- 0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
- 0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
- 0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
- 0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
- 0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
- 0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
- 0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
- 0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
- 0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
- 0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
- 0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
- 0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
-};
-
-const u8 Td4s[256] = {
- 0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
- 0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
- 0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
- 0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
- 0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
- 0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
- 0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
- 0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
- 0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
- 0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
- 0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
- 0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
- 0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
- 0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
- 0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
- 0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
- 0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
- 0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
- 0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
- 0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
- 0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
- 0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
- 0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
- 0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
- 0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
- 0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
- 0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
- 0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
- 0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
- 0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
- 0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
- 0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
-};
-const u8 rcons[] = {
- 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36
- /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-};
-
-/**
- * Expand the cipher key into the encryption key schedule.
- *
- * @return the number of rounds for the given cipher key size.
- */
-#define ROUND(i, d, s) \
-do { \
- d##0 = TE0(s##0) ^ TE1(s##1) ^ TE2(s##2) ^ TE3(s##3) ^ rk[4 * i]; \
- d##1 = TE0(s##1) ^ TE1(s##2) ^ TE2(s##3) ^ TE3(s##0) ^ rk[4 * i + 1]; \
- d##2 = TE0(s##2) ^ TE1(s##3) ^ TE2(s##0) ^ TE3(s##1) ^ rk[4 * i + 2]; \
- d##3 = TE0(s##3) ^ TE1(s##0) ^ TE2(s##1) ^ TE3(s##2) ^ rk[4 * i + 3]; \
-} while (0)
--
2.16.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] staging:r8188eu: Use lib80211 to encrypt (CCMP) tx frames
2018-07-14 17:54 ` [PATCH 2/2] staging:r8188eu: Use lib80211 to encrypt (CCMP) " Ivan Safonov
@ 2018-07-16 13:30 ` Michael Straube
2018-08-02 16:35 ` Michael Straube
0 siblings, 1 reply; 6+ messages in thread
From: Michael Straube @ 2018-07-16 13:30 UTC (permalink / raw)
To: Ivan Safonov, Greg Kroah-Hartman
Cc: Santha Meena Ramamoorthy, Janani Sankara Babu, devel, linux-kernel
On 07/14/18 19:54, Ivan Safonov wrote:
> Put data to skb, decrypt with lib80211_crypt_ccmp, and place back to tx buffer.
>
> Signed-off-by: Ivan Safonov <insafonov@gmail.com>
> ---
> drivers/staging/rtl8188eu/core/rtw_security.c | 778 +++-----------------------
> 1 file changed, 72 insertions(+), 706 deletions(-)
>
Hi Ivan,
with this applied I get the following in dmesg:
[ 3.901334] [drm] Initialized amdgpu 3.26.0 20150101 for 0000:07:00.0 on minor 0
[ 4.108904] IPv6: ADDRCONF(NETDEV_UP): enp6s0: link is not ready
[ 4.185502] r8169 0000:06:00.0 enp6s0: link down
[ 4.185564] IPv6: ADDRCONF(NETDEV_UP): enp6s0: link is not ready
[ 4.193647] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
[ 17.741809] MAC Address = 7c:8b:ca:08:80:7e
[ 17.828850] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
[ 17.969593] R8188EU: indicate disassoc
[ 18.081923] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
[ 18.123036] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
[ 23.034084] R8188EU: assoc success
[ 23.085043] IPv6: ADDRCONF(NETDEV_CHANGE): wlp1s0f0u9: link becomes ready
[ 23.093587] BUG: scheduling while atomic: NetworkManager/495/0x00000202
[ 23.093590] Modules linked in: amdkfd amd_iommu_v2 amdgpu nls_iso8859_1 nls_cp437 vfat fat r8188eu(C) lib80211 snd_hda_codec_realtek cfg80211 snd_hda_codec_generic edac_mce_amd chash snd_hda_codec_hdmi gpu_sched kvm_amd i2c_algo_bit ttm ccp snd_hda_intel rng_core drm_kms_helper kvm snd_hda_codec input_leds led_class joydev mousedev drm rfkill irqbypass snd_hda_core crct10dif_pclmul agpgart crc32_pclmul snd_hwdep ghash_clmulni_intel syscopyarea sysfillrect sysimgblt pcbc wmi_bmof snd_pcm aesni_intel snd_timer aes_x86_64 crypto_simd cryptd k10temp fb_sys_fops snd r8169 sp5100_tco pcspkr glue_helper soundcore mii i2c_piix4 rtc_cmos pinctrl_amd evdev gpio_amdpt wmi mac_hid acpi_cpufreq crypto_user ip_tables x_tables ext4 crc32c_generic crc16 mbcache jbd2 fscrypto sd_mod hid_generic usbhid hid ahci libahci
[ 23.093655] xhci_pci xhci_hcd libata crc32c_intel usbcore scsi_mod usb_common
[ 23.093661] Preemption disabled at:
[ 23.093667] [<ffffffffb9600954>] __dev_queue_xmit+0x74/0x910
[ 23.093672] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G C 4.18.0-rc5-staging+ #1
[ 23.093673] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
[ 23.093675] Call Trace:
[ 23.093683] dump_stack+0x5c/0x80
[ 23.093686] ? __dev_queue_xmit+0x74/0x910
[ 23.093691] __schedule_bug.cold.14+0x82/0x9b
[ 23.093696] __schedule+0x705/0x8b0
[ 23.093700] ? enqueue_task_fair+0xc3/0x730
[ 23.093704] schedule+0x32/0x90
[ 23.093707] schedule_timeout+0x311/0x4a0
[ 23.093710] ? _raw_spin_unlock_irqrestore+0x20/0x40
[ 23.093713] ? try_to_wake_up+0x23a/0x490
[ 23.093716] wait_for_common+0x15f/0x190
[ 23.093719] ? wake_up_q+0x70/0x70
[ 23.093736] ? rtw_aes_encrypt+0x26f/0x290 [r8188eu]
[ 23.093739] wait_for_completion_killable+0x19/0x30
[ 23.093743] call_usermodehelper_exec+0x115/0x160
[ 23.093747] __request_module+0x1ac/0x3e2
[ 23.093764] rtw_aes_encrypt+0x26f/0x290 [r8188eu]
[ 23.093778] ? rtw_get_stainfo+0xe6/0x130 [r8188eu]
[ 23.093793] rtw_xmitframe_coalesce+0x950/0xb00 [r8188eu]
[ 23.093799] ? _raw_spin_lock_irqsave+0x25/0x50
[ 23.093812] rtw_hal_xmit+0x83/0x130 [r8188eu]
[ 23.093826] rtw_xmit+0x258/0x5d0 [r8188eu]
[ 23.093840] rtw_xmit_entry+0xe8/0x2e7 [r8188eu]
[ 23.093845] dev_hard_start_xmit+0xa5/0x240
[ 23.093849] sch_direct_xmit+0x150/0x340
[ 23.093852] __dev_queue_xmit+0x2f6/0x910
[ 23.093856] packet_sendmsg+0x945/0x1592
[ 23.093860] ? attach_to_pi_state+0x18/0x110
[ 23.093862] ? preempt_count_sub+0x60/0x90
[ 23.093866] ? ep_item_poll.isra.1+0x40/0xc0
[ 23.093871] sock_sendmsg+0x33/0x40
[ 23.093874] __sys_sendto+0xee/0x160
[ 23.093879] ? memzero_explicit+0xa/0x10
[ 23.093883] ? urandom_read+0x120/0x270
[ 23.093887] __x64_sys_sendto+0x24/0x30
[ 23.093890] do_syscall_64+0x5b/0x170
[ 23.093893] entry_SYSCALL_64_after_hwframe+0x44/0xa9
[ 23.093896] RIP: 0033:0x7fac0b700c12
[ 23.093897] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
[ 23.093935] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
[ 23.093938] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
[ 23.093939] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
[ 23.093940] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
[ 23.093942] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
[ 23.093943] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
[ 23.096167] lib80211_crypt: registered algorithm 'CCMP'
[ 23.096544] ------------[ cut here ]------------
[ 23.096549] DEBUG_LOCKS_WARN_ON(val > preempt_count())
[ 23.096557] WARNING: CPU: 7 PID: 495 at kernel/sched/core.c:3246 preempt_count_sub+0x5a/0x90
[ 23.096561] Modules linked in: lib80211_crypt_ccmp amdkfd amd_iommu_v2 amdgpu nls_iso8859_1 nls_cp437 vfat fat r8188eu(C) lib80211 snd_hda_codec_realtek cfg80211 snd_hda_codec_generic edac_mce_amd chash snd_hda_codec_hdmi gpu_sched kvm_amd i2c_algo_bit ttm ccp snd_hda_intel rng_core drm_kms_helper kvm snd_hda_codec input_leds led_class joydev mousedev drm rfkill irqbypass snd_hda_core crct10dif_pclmul agpgart crc32_pclmul snd_hwdep ghash_clmulni_intel syscopyarea sysfillrect sysimgblt pcbc wmi_bmof snd_pcm aesni_intel snd_timer aes_x86_64 crypto_simd cryptd k10temp fb_sys_fops snd r8169 sp5100_tco pcspkr glue_helper soundcore mii i2c_piix4 rtc_cmos pinctrl_amd evdev gpio_amdpt wmi mac_hid acpi_cpufreq crypto_user ip_tables x_tables ext4 crc32c_generic crc16 mbcache jbd2 fscrypto sd_mod hid_generic
[ 23.096604] usbhid hid ahci libahci xhci_pci xhci_hcd libata crc32c_intel usbcore scsi_mod usb_common
[ 23.096613] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G WC 4.18.0-rc5-staging+ #1
[ 23.096615] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
[ 23.096618] RIP: 0010:preempt_count_sub+0x5a/0x90
[ 23.096619] Code: 15 f7 46 c3 e8 a7 86 2d 00 85 c0 74 f6 8b 15 15 6b 5a 01 85 d2 75 ec 48 c7 c6 be fb e6 b9 48 c7 c7 6b ad e5 b9 e8 c0 77 fd ff <0f> 0b c3 84 d2 75 c9 e8 7a 86 2d 00 85 c0 74 c9 8b 05 e8 6a 5a 01
[ 23.096647] RSP: 0018:ffff9d5581447c48 EFLAGS: 00010286
[ 23.096650] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000001
[ 23.096652] RDX: 0000000080000001 RSI: ffffffffb9e82096 RDI: 00000000ffffffff
[ 23.096653] RBP: ffff959ef568a600 R08: 0000001cb3397218 R09: 00000000000003f3
[ 23.096655] R10: ffffffffba5f7700 R11: 0000000000000000 R12: ffff959ef568a6ac
[ 23.096657] R13: ffff959f0db9a000 R14: ffff959f15441000 R15: 0000000000000007
[ 23.096660] FS: 00007fac0dcd9000(0000) GS:ffff959f1edc0000(0000) knlGS:0000000000000000
[ 23.096663] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 23.096665] CR2: 00007fffc462efe8 CR3: 0000000206e88000 CR4: 00000000003406e0
[ 23.096667] Call Trace:
[ 23.096674] _raw_spin_unlock+0x16/0x30
[ 23.096678] sch_direct_xmit+0x178/0x340
[ 23.096684] __dev_queue_xmit+0x2f6/0x910
[ 23.096689] packet_sendmsg+0x945/0x1592
[ 23.096694] ? attach_to_pi_state+0x18/0x110
[ 23.096696] ? preempt_count_sub+0x60/0x90
[ 23.096701] ? ep_item_poll.isra.1+0x40/0xc0
[ 23.096706] sock_sendmsg+0x33/0x40
[ 23.096710] __sys_sendto+0xee/0x160
[ 23.096715] ? memzero_explicit+0xa/0x10
[ 23.096719] ? urandom_read+0x120/0x270
[ 23.096724] __x64_sys_sendto+0x24/0x30
[ 23.096728] do_syscall_64+0x5b/0x170
[ 23.096732] entry_SYSCALL_64_after_hwframe+0x44/0xa9
[ 23.096735] RIP: 0033:0x7fac0b700c12
[ 23.096736] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
[ 23.096763] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
[ 23.096766] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
[ 23.096767] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
[ 23.096769] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
[ 23.096770] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
[ 23.096772] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
[ 23.096775] ---[ end trace 8e7e0aecb937369e ]---
[ 23.096792] BUG: using __this_cpu_read() in preemptible [00000000] code: NetworkManager/495
[ 23.096795] caller is __local_bh_enable_ip+0x50/0x80
[ 23.096798] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G WC 4.18.0-rc5-staging+ #1
[ 23.096799] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
[ 23.096800] Call Trace:
[ 23.096804] dump_stack+0x5c/0x80
[ 23.096808] check_preemption_disabled.cold.0+0x46/0x51
[ 23.096812] __local_bh_enable_ip+0x50/0x80
[ 23.096814] __dev_queue_xmit+0x450/0x910
[ 23.096819] packet_sendmsg+0x945/0x1592
[ 23.096823] ? attach_to_pi_state+0x18/0x110
[ 23.096826] ? preempt_count_sub+0x60/0x90
[ 23.096829] ? ep_item_poll.isra.1+0x40/0xc0
[ 23.096833] sock_sendmsg+0x33/0x40
[ 23.096835] __sys_sendto+0xee/0x160
[ 23.096840] ? memzero_explicit+0xa/0x10
[ 23.096842] ? urandom_read+0x120/0x270
[ 23.096845] __x64_sys_sendto+0x24/0x30
[ 23.096848] do_syscall_64+0x5b/0x170
[ 23.096850] entry_SYSCALL_64_after_hwframe+0x44/0xa9
[ 23.096852] RIP: 0033:0x7fac0b700c12
[ 23.096853] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
[ 23.096880] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
[ 23.096882] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
[ 23.096885] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
[ 23.096886] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
[ 23.096888] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
[ 23.096889] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] staging:r8188eu: Use lib80211 to encrypt (CCMP) tx frames
2018-07-16 13:30 ` Michael Straube
@ 2018-08-02 16:35 ` Michael Straube
2018-08-05 14:07 ` Greg Kroah-Hartman
0 siblings, 1 reply; 6+ messages in thread
From: Michael Straube @ 2018-08-02 16:35 UTC (permalink / raw)
To: Ivan Safonov, Greg Kroah-Hartman
Cc: Santha Meena Ramamoorthy, Janani Sankara Babu, devel, linux-kernel
On 07/16/18 15:30, Michael Straube wrote:
> On 07/14/18 19:54, Ivan Safonov wrote:
>> Put data to skb, decrypt with lib80211_crypt_ccmp, and place back to tx buffer.
>>
>> Signed-off-by: Ivan Safonov <insafonov@gmail.com>
>> ---
>> drivers/staging/rtl8188eu/core/rtw_security.c | 778 +++-----------------------
>> 1 file changed, 72 insertions(+), 706 deletions(-)
>>
>
> Hi Ivan,
>
> with this applied I get the following in dmesg:
>
> [ 3.901334] [drm] Initialized amdgpu 3.26.0 20150101 for 0000:07:00.0 on minor 0
> [ 4.108904] IPv6: ADDRCONF(NETDEV_UP): enp6s0: link is not ready
> [ 4.185502] r8169 0000:06:00.0 enp6s0: link down
> [ 4.185564] IPv6: ADDRCONF(NETDEV_UP): enp6s0: link is not ready
> [ 4.193647] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
> [ 17.741809] MAC Address = 7c:8b:ca:08:80:7e
> [ 17.828850] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
> [ 17.969593] R8188EU: indicate disassoc
> [ 18.081923] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
> [ 18.123036] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
> [ 23.034084] R8188EU: assoc success
> [ 23.085043] IPv6: ADDRCONF(NETDEV_CHANGE): wlp1s0f0u9: link becomes ready
> [ 23.093587] BUG: scheduling while atomic: NetworkManager/495/0x00000202
> [ 23.093590] Modules linked in: amdkfd amd_iommu_v2 amdgpu nls_iso8859_1 nls_cp437 vfat fat r8188eu(C) lib80211 snd_hda_codec_realtek cfg80211 snd_hda_codec_generic edac_mce_amd chash snd_hda_codec_hdmi gpu_sched kvm_amd i2c_algo_bit ttm ccp snd_hda_intel rng_core drm_kms_helper kvm snd_hda_codec input_leds led_class joydev mousedev drm rfkill irqbypass snd_hda_core crct10dif_pclmul agpgart crc32_pclmul snd_hwdep ghash_clmulni_intel syscopyarea sysfillrect sysimgblt pcbc wmi_bmof snd_pcm aesni_intel snd_timer aes_x86_64 crypto_simd cryptd k10temp fb_sys_fops snd r8169 sp5100_tco pcspkr glue_helper soundcore mii i2c_piix4 rtc_cmos pinctrl_amd evdev gpio_amdpt wmi mac_hid acpi_cpufreq crypto_user ip_tables x_tables ext4 crc32c_generic crc16 mbcache jbd2 fscrypto sd_mod hid_generic usbhid hid ahci libahci
> [ 23.093655] xhci_pci xhci_hcd libata crc32c_intel usbcore scsi_mod usb_common
> [ 23.093661] Preemption disabled at:
> [ 23.093667] [<ffffffffb9600954>] __dev_queue_xmit+0x74/0x910
> [ 23.093672] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G C 4.18.0-rc5-staging+ #1
> [ 23.093673] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
> [ 23.093675] Call Trace:
> [ 23.093683] dump_stack+0x5c/0x80
> [ 23.093686] ? __dev_queue_xmit+0x74/0x910
> [ 23.093691] __schedule_bug.cold.14+0x82/0x9b
> [ 23.093696] __schedule+0x705/0x8b0
> [ 23.093700] ? enqueue_task_fair+0xc3/0x730
> [ 23.093704] schedule+0x32/0x90
> [ 23.093707] schedule_timeout+0x311/0x4a0
> [ 23.093710] ? _raw_spin_unlock_irqrestore+0x20/0x40
> [ 23.093713] ? try_to_wake_up+0x23a/0x490
> [ 23.093716] wait_for_common+0x15f/0x190
> [ 23.093719] ? wake_up_q+0x70/0x70
> [ 23.093736] ? rtw_aes_encrypt+0x26f/0x290 [r8188eu]
> [ 23.093739] wait_for_completion_killable+0x19/0x30
> [ 23.093743] call_usermodehelper_exec+0x115/0x160
> [ 23.093747] __request_module+0x1ac/0x3e2
> [ 23.093764] rtw_aes_encrypt+0x26f/0x290 [r8188eu]
> [ 23.093778] ? rtw_get_stainfo+0xe6/0x130 [r8188eu]
> [ 23.093793] rtw_xmitframe_coalesce+0x950/0xb00 [r8188eu]
> [ 23.093799] ? _raw_spin_lock_irqsave+0x25/0x50
> [ 23.093812] rtw_hal_xmit+0x83/0x130 [r8188eu]
> [ 23.093826] rtw_xmit+0x258/0x5d0 [r8188eu]
> [ 23.093840] rtw_xmit_entry+0xe8/0x2e7 [r8188eu]
> [ 23.093845] dev_hard_start_xmit+0xa5/0x240
> [ 23.093849] sch_direct_xmit+0x150/0x340
> [ 23.093852] __dev_queue_xmit+0x2f6/0x910
> [ 23.093856] packet_sendmsg+0x945/0x1592
> [ 23.093860] ? attach_to_pi_state+0x18/0x110
> [ 23.093862] ? preempt_count_sub+0x60/0x90
> [ 23.093866] ? ep_item_poll.isra.1+0x40/0xc0
> [ 23.093871] sock_sendmsg+0x33/0x40
> [ 23.093874] __sys_sendto+0xee/0x160
> [ 23.093879] ? memzero_explicit+0xa/0x10
> [ 23.093883] ? urandom_read+0x120/0x270
> [ 23.093887] __x64_sys_sendto+0x24/0x30
> [ 23.093890] do_syscall_64+0x5b/0x170
> [ 23.093893] entry_SYSCALL_64_after_hwframe+0x44/0xa9
> [ 23.093896] RIP: 0033:0x7fac0b700c12
> [ 23.093897] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
> [ 23.093935] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
> [ 23.093938] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
> [ 23.093939] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
> [ 23.093940] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
> [ 23.093942] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
> [ 23.093943] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
> [ 23.096167] lib80211_crypt: registered algorithm 'CCMP'
> [ 23.096544] ------------[ cut here ]------------
> [ 23.096549] DEBUG_LOCKS_WARN_ON(val > preempt_count())
> [ 23.096557] WARNING: CPU: 7 PID: 495 at kernel/sched/core.c:3246 preempt_count_sub+0x5a/0x90
> [ 23.096561] Modules linked in: lib80211_crypt_ccmp amdkfd amd_iommu_v2 amdgpu nls_iso8859_1 nls_cp437 vfat fat r8188eu(C) lib80211 snd_hda_codec_realtek cfg80211 snd_hda_codec_generic edac_mce_amd chash snd_hda_codec_hdmi gpu_sched kvm_amd i2c_algo_bit ttm ccp snd_hda_intel rng_core drm_kms_helper kvm snd_hda_codec input_leds led_class joydev mousedev drm rfkill irqbypass snd_hda_core crct10dif_pclmul agpgart crc32_pclmul snd_hwdep ghash_clmulni_intel syscopyarea sysfillrect sysimgblt pcbc wmi_bmof snd_pcm aesni_intel snd_timer aes_x86_64 crypto_simd cryptd k10temp fb_sys_fops snd r8169 sp5100_tco pcspkr glue_helper soundcore mii i2c_piix4 rtc_cmos pinctrl_amd evdev gpio_amdpt wmi mac_hid acpi_cpufreq crypto_user ip_tables x_tables ext4 crc32c_generic crc16 mbcache jbd2 fscrypto sd_mod hid_generic
> [ 23.096604] usbhid hid ahci libahci xhci_pci xhci_hcd libata crc32c_intel usbcore scsi_mod usb_common
> [ 23.096613] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G WC 4.18.0-rc5-staging+ #1
> [ 23.096615] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
> [ 23.096618] RIP: 0010:preempt_count_sub+0x5a/0x90
> [ 23.096619] Code: 15 f7 46 c3 e8 a7 86 2d 00 85 c0 74 f6 8b 15 15 6b 5a 01 85 d2 75 ec 48 c7 c6 be fb e6 b9 48 c7 c7 6b ad e5 b9 e8 c0 77 fd ff <0f> 0b c3 84 d2 75 c9 e8 7a 86 2d 00 85 c0 74 c9 8b 05 e8 6a 5a 01
> [ 23.096647] RSP: 0018:ffff9d5581447c48 EFLAGS: 00010286
> [ 23.096650] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000001
> [ 23.096652] RDX: 0000000080000001 RSI: ffffffffb9e82096 RDI: 00000000ffffffff
> [ 23.096653] RBP: ffff959ef568a600 R08: 0000001cb3397218 R09: 00000000000003f3
> [ 23.096655] R10: ffffffffba5f7700 R11: 0000000000000000 R12: ffff959ef568a6ac
> [ 23.096657] R13: ffff959f0db9a000 R14: ffff959f15441000 R15: 0000000000000007
> [ 23.096660] FS: 00007fac0dcd9000(0000) GS:ffff959f1edc0000(0000) knlGS:0000000000000000
> [ 23.096663] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> [ 23.096665] CR2: 00007fffc462efe8 CR3: 0000000206e88000 CR4: 00000000003406e0
> [ 23.096667] Call Trace:
> [ 23.096674] _raw_spin_unlock+0x16/0x30
> [ 23.096678] sch_direct_xmit+0x178/0x340
> [ 23.096684] __dev_queue_xmit+0x2f6/0x910
> [ 23.096689] packet_sendmsg+0x945/0x1592
> [ 23.096694] ? attach_to_pi_state+0x18/0x110
> [ 23.096696] ? preempt_count_sub+0x60/0x90
> [ 23.096701] ? ep_item_poll.isra.1+0x40/0xc0
> [ 23.096706] sock_sendmsg+0x33/0x40
> [ 23.096710] __sys_sendto+0xee/0x160
> [ 23.096715] ? memzero_explicit+0xa/0x10
> [ 23.096719] ? urandom_read+0x120/0x270
> [ 23.096724] __x64_sys_sendto+0x24/0x30
> [ 23.096728] do_syscall_64+0x5b/0x170
> [ 23.096732] entry_SYSCALL_64_after_hwframe+0x44/0xa9
> [ 23.096735] RIP: 0033:0x7fac0b700c12
> [ 23.096736] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
> [ 23.096763] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
> [ 23.096766] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
> [ 23.096767] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
> [ 23.096769] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
> [ 23.096770] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
> [ 23.096772] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
> [ 23.096775] ---[ end trace 8e7e0aecb937369e ]---
> [ 23.096792] BUG: using __this_cpu_read() in preemptible [00000000] code: NetworkManager/495
> [ 23.096795] caller is __local_bh_enable_ip+0x50/0x80
> [ 23.096798] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G WC 4.18.0-rc5-staging+ #1
> [ 23.096799] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
> [ 23.096800] Call Trace:
> [ 23.096804] dump_stack+0x5c/0x80
> [ 23.096808] check_preemption_disabled.cold.0+0x46/0x51
> [ 23.096812] __local_bh_enable_ip+0x50/0x80
> [ 23.096814] __dev_queue_xmit+0x450/0x910
> [ 23.096819] packet_sendmsg+0x945/0x1592
> [ 23.096823] ? attach_to_pi_state+0x18/0x110
> [ 23.096826] ? preempt_count_sub+0x60/0x90
> [ 23.096829] ? ep_item_poll.isra.1+0x40/0xc0
> [ 23.096833] sock_sendmsg+0x33/0x40
> [ 23.096835] __sys_sendto+0xee/0x160
> [ 23.096840] ? memzero_explicit+0xa/0x10
> [ 23.096842] ? urandom_read+0x120/0x270
> [ 23.096845] __x64_sys_sendto+0x24/0x30
> [ 23.096848] do_syscall_64+0x5b/0x170
> [ 23.096850] entry_SYSCALL_64_after_hwframe+0x44/0xa9
> [ 23.096852] RIP: 0033:0x7fac0b700c12
> [ 23.096853] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
> [ 23.096880] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
> [ 23.096882] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
> [ 23.096885] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
> [ 23.096886] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
> [ 23.096888] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
> [ 23.096889] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
>
>
>
Hi,
I guess in addition to
Revert "staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames"
this patch should also be reverted. I still get the above messages in dmesg.
With this [1] reverted dmesg looks good.
[1]
515ce733e86ee2e1bea4dba76d2d4491013d0f73
staging:r8188eu: Use lib80211 to encrypt (CCMP) tx frames
Best regards,
Michael
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] staging:r8188eu: Use lib80211 to encrypt (CCMP) tx frames
2018-08-02 16:35 ` Michael Straube
@ 2018-08-05 14:07 ` Greg Kroah-Hartman
2018-08-05 20:46 ` Michael Straube
0 siblings, 1 reply; 6+ messages in thread
From: Greg Kroah-Hartman @ 2018-08-05 14:07 UTC (permalink / raw)
To: Michael Straube
Cc: Ivan Safonov, devel, Santha Meena Ramamoorthy,
Janani Sankara Babu, linux-kernel
On Thu, Aug 02, 2018 at 06:35:05PM +0200, Michael Straube wrote:
> On 07/16/18 15:30, Michael Straube wrote:
> > On 07/14/18 19:54, Ivan Safonov wrote:
> > > Put data to skb, decrypt with lib80211_crypt_ccmp, and place back to tx buffer.
> > >
> > > Signed-off-by: Ivan Safonov <insafonov@gmail.com>
> > > ---
> > > drivers/staging/rtl8188eu/core/rtw_security.c | 778 +++-----------------------
> > > 1 file changed, 72 insertions(+), 706 deletions(-)
> > >
> >
> > Hi Ivan,
> >
> > with this applied I get the following in dmesg:
> >
> > [ 3.901334] [drm] Initialized amdgpu 3.26.0 20150101 for 0000:07:00.0 on minor 0
> > [ 4.108904] IPv6: ADDRCONF(NETDEV_UP): enp6s0: link is not ready
> > [ 4.185502] r8169 0000:06:00.0 enp6s0: link down
> > [ 4.185564] IPv6: ADDRCONF(NETDEV_UP): enp6s0: link is not ready
> > [ 4.193647] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
> > [ 17.741809] MAC Address = 7c:8b:ca:08:80:7e
> > [ 17.828850] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
> > [ 17.969593] R8188EU: indicate disassoc
> > [ 18.081923] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
> > [ 18.123036] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
> > [ 23.034084] R8188EU: assoc success
> > [ 23.085043] IPv6: ADDRCONF(NETDEV_CHANGE): wlp1s0f0u9: link becomes ready
> > [ 23.093587] BUG: scheduling while atomic: NetworkManager/495/0x00000202
> > [ 23.093590] Modules linked in: amdkfd amd_iommu_v2 amdgpu nls_iso8859_1 nls_cp437 vfat fat r8188eu(C) lib80211 snd_hda_codec_realtek cfg80211 snd_hda_codec_generic edac_mce_amd chash snd_hda_codec_hdmi gpu_sched kvm_amd i2c_algo_bit ttm ccp snd_hda_intel rng_core drm_kms_helper kvm snd_hda_codec input_leds led_class joydev mousedev drm rfkill irqbypass snd_hda_core crct10dif_pclmul agpgart crc32_pclmul snd_hwdep ghash_clmulni_intel syscopyarea sysfillrect sysimgblt pcbc wmi_bmof snd_pcm aesni_intel snd_timer aes_x86_64 crypto_simd cryptd k10temp fb_sys_fops snd r8169 sp5100_tco pcspkr glue_helper soundcore mii i2c_piix4 rtc_cmos pinctrl_amd evdev gpio_amdpt wmi mac_hid acpi_cpufreq crypto_user ip_tables x_tables ext4 crc32c_generic crc16 mbcache jbd2 fscrypto sd_mod hid_generic usbhid hid ahci libahci
> > [ 23.093655] xhci_pci xhci_hcd libata crc32c_intel usbcore scsi_mod usb_common
> > [ 23.093661] Preemption disabled at:
> > [ 23.093667] [<ffffffffb9600954>] __dev_queue_xmit+0x74/0x910
> > [ 23.093672] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G C 4.18.0-rc5-staging+ #1
> > [ 23.093673] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
> > [ 23.093675] Call Trace:
> > [ 23.093683] dump_stack+0x5c/0x80
> > [ 23.093686] ? __dev_queue_xmit+0x74/0x910
> > [ 23.093691] __schedule_bug.cold.14+0x82/0x9b
> > [ 23.093696] __schedule+0x705/0x8b0
> > [ 23.093700] ? enqueue_task_fair+0xc3/0x730
> > [ 23.093704] schedule+0x32/0x90
> > [ 23.093707] schedule_timeout+0x311/0x4a0
> > [ 23.093710] ? _raw_spin_unlock_irqrestore+0x20/0x40
> > [ 23.093713] ? try_to_wake_up+0x23a/0x490
> > [ 23.093716] wait_for_common+0x15f/0x190
> > [ 23.093719] ? wake_up_q+0x70/0x70
> > [ 23.093736] ? rtw_aes_encrypt+0x26f/0x290 [r8188eu]
> > [ 23.093739] wait_for_completion_killable+0x19/0x30
> > [ 23.093743] call_usermodehelper_exec+0x115/0x160
> > [ 23.093747] __request_module+0x1ac/0x3e2
> > [ 23.093764] rtw_aes_encrypt+0x26f/0x290 [r8188eu]
> > [ 23.093778] ? rtw_get_stainfo+0xe6/0x130 [r8188eu]
> > [ 23.093793] rtw_xmitframe_coalesce+0x950/0xb00 [r8188eu]
> > [ 23.093799] ? _raw_spin_lock_irqsave+0x25/0x50
> > [ 23.093812] rtw_hal_xmit+0x83/0x130 [r8188eu]
> > [ 23.093826] rtw_xmit+0x258/0x5d0 [r8188eu]
> > [ 23.093840] rtw_xmit_entry+0xe8/0x2e7 [r8188eu]
> > [ 23.093845] dev_hard_start_xmit+0xa5/0x240
> > [ 23.093849] sch_direct_xmit+0x150/0x340
> > [ 23.093852] __dev_queue_xmit+0x2f6/0x910
> > [ 23.093856] packet_sendmsg+0x945/0x1592
> > [ 23.093860] ? attach_to_pi_state+0x18/0x110
> > [ 23.093862] ? preempt_count_sub+0x60/0x90
> > [ 23.093866] ? ep_item_poll.isra.1+0x40/0xc0
> > [ 23.093871] sock_sendmsg+0x33/0x40
> > [ 23.093874] __sys_sendto+0xee/0x160
> > [ 23.093879] ? memzero_explicit+0xa/0x10
> > [ 23.093883] ? urandom_read+0x120/0x270
> > [ 23.093887] __x64_sys_sendto+0x24/0x30
> > [ 23.093890] do_syscall_64+0x5b/0x170
> > [ 23.093893] entry_SYSCALL_64_after_hwframe+0x44/0xa9
> > [ 23.093896] RIP: 0033:0x7fac0b700c12
> > [ 23.093897] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
> > [ 23.093935] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
> > [ 23.093938] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
> > [ 23.093939] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
> > [ 23.093940] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
> > [ 23.093942] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
> > [ 23.093943] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
> > [ 23.096167] lib80211_crypt: registered algorithm 'CCMP'
> > [ 23.096544] ------------[ cut here ]------------
> > [ 23.096549] DEBUG_LOCKS_WARN_ON(val > preempt_count())
> > [ 23.096557] WARNING: CPU: 7 PID: 495 at kernel/sched/core.c:3246 preempt_count_sub+0x5a/0x90
> > [ 23.096561] Modules linked in: lib80211_crypt_ccmp amdkfd amd_iommu_v2 amdgpu nls_iso8859_1 nls_cp437 vfat fat r8188eu(C) lib80211 snd_hda_codec_realtek cfg80211 snd_hda_codec_generic edac_mce_amd chash snd_hda_codec_hdmi gpu_sched kvm_amd i2c_algo_bit ttm ccp snd_hda_intel rng_core drm_kms_helper kvm snd_hda_codec input_leds led_class joydev mousedev drm rfkill irqbypass snd_hda_core crct10dif_pclmul agpgart crc32_pclmul snd_hwdep ghash_clmulni_intel syscopyarea sysfillrect sysimgblt pcbc wmi_bmof snd_pcm aesni_intel snd_timer aes_x86_64 crypto_simd cryptd k10temp fb_sys_fops snd r8169 sp5100_tco pcspkr glue_helper soundcore mii i2c_piix4 rtc_cmos pinctrl_amd evdev gpio_amdpt wmi mac_hid acpi_cpufreq crypto_user ip_tables x_tables ext4 crc32c_generic crc16 mbcache jbd2 fscrypto sd_mod hid_generic
> > [ 23.096604] usbhid hid ahci libahci xhci_pci xhci_hcd libata crc32c_intel usbcore scsi_mod usb_common
> > [ 23.096613] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G WC 4.18.0-rc5-staging+ #1
> > [ 23.096615] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
> > [ 23.096618] RIP: 0010:preempt_count_sub+0x5a/0x90
> > [ 23.096619] Code: 15 f7 46 c3 e8 a7 86 2d 00 85 c0 74 f6 8b 15 15 6b 5a 01 85 d2 75 ec 48 c7 c6 be fb e6 b9 48 c7 c7 6b ad e5 b9 e8 c0 77 fd ff <0f> 0b c3 84 d2 75 c9 e8 7a 86 2d 00 85 c0 74 c9 8b 05 e8 6a 5a 01
> > [ 23.096647] RSP: 0018:ffff9d5581447c48 EFLAGS: 00010286
> > [ 23.096650] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000001
> > [ 23.096652] RDX: 0000000080000001 RSI: ffffffffb9e82096 RDI: 00000000ffffffff
> > [ 23.096653] RBP: ffff959ef568a600 R08: 0000001cb3397218 R09: 00000000000003f3
> > [ 23.096655] R10: ffffffffba5f7700 R11: 0000000000000000 R12: ffff959ef568a6ac
> > [ 23.096657] R13: ffff959f0db9a000 R14: ffff959f15441000 R15: 0000000000000007
> > [ 23.096660] FS: 00007fac0dcd9000(0000) GS:ffff959f1edc0000(0000) knlGS:0000000000000000
> > [ 23.096663] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
> > [ 23.096665] CR2: 00007fffc462efe8 CR3: 0000000206e88000 CR4: 00000000003406e0
> > [ 23.096667] Call Trace:
> > [ 23.096674] _raw_spin_unlock+0x16/0x30
> > [ 23.096678] sch_direct_xmit+0x178/0x340
> > [ 23.096684] __dev_queue_xmit+0x2f6/0x910
> > [ 23.096689] packet_sendmsg+0x945/0x1592
> > [ 23.096694] ? attach_to_pi_state+0x18/0x110
> > [ 23.096696] ? preempt_count_sub+0x60/0x90
> > [ 23.096701] ? ep_item_poll.isra.1+0x40/0xc0
> > [ 23.096706] sock_sendmsg+0x33/0x40
> > [ 23.096710] __sys_sendto+0xee/0x160
> > [ 23.096715] ? memzero_explicit+0xa/0x10
> > [ 23.096719] ? urandom_read+0x120/0x270
> > [ 23.096724] __x64_sys_sendto+0x24/0x30
> > [ 23.096728] do_syscall_64+0x5b/0x170
> > [ 23.096732] entry_SYSCALL_64_after_hwframe+0x44/0xa9
> > [ 23.096735] RIP: 0033:0x7fac0b700c12
> > [ 23.096736] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
> > [ 23.096763] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
> > [ 23.096766] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
> > [ 23.096767] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
> > [ 23.096769] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
> > [ 23.096770] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
> > [ 23.096772] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
> > [ 23.096775] ---[ end trace 8e7e0aecb937369e ]---
> > [ 23.096792] BUG: using __this_cpu_read() in preemptible [00000000] code: NetworkManager/495
> > [ 23.096795] caller is __local_bh_enable_ip+0x50/0x80
> > [ 23.096798] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G WC 4.18.0-rc5-staging+ #1
> > [ 23.096799] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
> > [ 23.096800] Call Trace:
> > [ 23.096804] dump_stack+0x5c/0x80
> > [ 23.096808] check_preemption_disabled.cold.0+0x46/0x51
> > [ 23.096812] __local_bh_enable_ip+0x50/0x80
> > [ 23.096814] __dev_queue_xmit+0x450/0x910
> > [ 23.096819] packet_sendmsg+0x945/0x1592
> > [ 23.096823] ? attach_to_pi_state+0x18/0x110
> > [ 23.096826] ? preempt_count_sub+0x60/0x90
> > [ 23.096829] ? ep_item_poll.isra.1+0x40/0xc0
> > [ 23.096833] sock_sendmsg+0x33/0x40
> > [ 23.096835] __sys_sendto+0xee/0x160
> > [ 23.096840] ? memzero_explicit+0xa/0x10
> > [ 23.096842] ? urandom_read+0x120/0x270
> > [ 23.096845] __x64_sys_sendto+0x24/0x30
> > [ 23.096848] do_syscall_64+0x5b/0x170
> > [ 23.096850] entry_SYSCALL_64_after_hwframe+0x44/0xa9
> > [ 23.096852] RIP: 0033:0x7fac0b700c12
> > [ 23.096853] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
> > [ 23.096880] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
> > [ 23.096882] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
> > [ 23.096885] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
> > [ 23.096886] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
> > [ 23.096888] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
> > [ 23.096889] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
> >
> >
> >
>
> Hi,
>
> I guess in addition to
> Revert "staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames"
>
> this patch should also be reverted. I still get the above messages in dmesg.
> With this [1] reverted dmesg looks good.
>
> [1]
> 515ce733e86ee2e1bea4dba76d2d4491013d0f73
> staging:r8188eu: Use lib80211 to encrypt (CCMP) tx frames
Can you send me a patch to revert this?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] staging:r8188eu: Use lib80211 to encrypt (CCMP) tx frames
2018-08-05 14:07 ` Greg Kroah-Hartman
@ 2018-08-05 20:46 ` Michael Straube
0 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2018-08-05 20:46 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Ivan Safonov, devel, Santha Meena Ramamoorthy,
Janani Sankara Babu, linux-kernel
On 08/05/18 16:07, Greg Kroah-Hartman wrote:
> On Thu, Aug 02, 2018 at 06:35:05PM +0200, Michael Straube wrote:
>> On 07/16/18 15:30, Michael Straube wrote:
>>> On 07/14/18 19:54, Ivan Safonov wrote:
>>>> Put data to skb, decrypt with lib80211_crypt_ccmp, and place back to tx buffer.
>>>>
>>>> Signed-off-by: Ivan Safonov <insafonov@gmail.com>
>>>> ---
>>>> drivers/staging/rtl8188eu/core/rtw_security.c | 778 +++-----------------------
>>>> 1 file changed, 72 insertions(+), 706 deletions(-)
>>>>
>>>
>>> Hi Ivan,
>>>
>>> with this applied I get the following in dmesg:
>>>
>>> [ 3.901334] [drm] Initialized amdgpu 3.26.0 20150101 for 0000:07:00.0 on minor 0
>>> [ 4.108904] IPv6: ADDRCONF(NETDEV_UP): enp6s0: link is not ready
>>> [ 4.185502] r8169 0000:06:00.0 enp6s0: link down
>>> [ 4.185564] IPv6: ADDRCONF(NETDEV_UP): enp6s0: link is not ready
>>> [ 4.193647] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
>>> [ 17.741809] MAC Address = 7c:8b:ca:08:80:7e
>>> [ 17.828850] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
>>> [ 17.969593] R8188EU: indicate disassoc
>>> [ 18.081923] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
>>> [ 18.123036] IPv6: ADDRCONF(NETDEV_UP): wlp1s0f0u9: link is not ready
>>> [ 23.034084] R8188EU: assoc success
>>> [ 23.085043] IPv6: ADDRCONF(NETDEV_CHANGE): wlp1s0f0u9: link becomes ready
>>> [ 23.093587] BUG: scheduling while atomic: NetworkManager/495/0x00000202
>>> [ 23.093590] Modules linked in: amdkfd amd_iommu_v2 amdgpu nls_iso8859_1 nls_cp437 vfat fat r8188eu(C) lib80211 snd_hda_codec_realtek cfg80211 snd_hda_codec_generic edac_mce_amd chash snd_hda_codec_hdmi gpu_sched kvm_amd i2c_algo_bit ttm ccp snd_hda_intel rng_core drm_kms_helper kvm snd_hda_codec input_leds led_class joydev mousedev drm rfkill irqbypass snd_hda_core crct10dif_pclmul agpgart crc32_pclmul snd_hwdep ghash_clmulni_intel syscopyarea sysfillrect sysimgblt pcbc wmi_bmof snd_pcm aesni_intel snd_timer aes_x86_64 crypto_simd cryptd k10temp fb_sys_fops snd r8169 sp5100_tco pcspkr glue_helper soundcore mii i2c_piix4 rtc_cmos pinctrl_amd evdev gpio_amdpt wmi mac_hid acpi_cpufreq crypto_user ip_tables x_tables ext4 crc32c_generic crc16 mbcache jbd2 fscrypto sd_mod hid_generic usbhid hid ahci libahci
>>> [ 23.093655] xhci_pci xhci_hcd libata crc32c_intel usbcore scsi_mod usb_common
>>> [ 23.093661] Preemption disabled at:
>>> [ 23.093667] [<ffffffffb9600954>] __dev_queue_xmit+0x74/0x910
>>> [ 23.093672] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G C 4.18.0-rc5-staging+ #1
>>> [ 23.093673] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
>>> [ 23.093675] Call Trace:
>>> [ 23.093683] dump_stack+0x5c/0x80
>>> [ 23.093686] ? __dev_queue_xmit+0x74/0x910
>>> [ 23.093691] __schedule_bug.cold.14+0x82/0x9b
>>> [ 23.093696] __schedule+0x705/0x8b0
>>> [ 23.093700] ? enqueue_task_fair+0xc3/0x730
>>> [ 23.093704] schedule+0x32/0x90
>>> [ 23.093707] schedule_timeout+0x311/0x4a0
>>> [ 23.093710] ? _raw_spin_unlock_irqrestore+0x20/0x40
>>> [ 23.093713] ? try_to_wake_up+0x23a/0x490
>>> [ 23.093716] wait_for_common+0x15f/0x190
>>> [ 23.093719] ? wake_up_q+0x70/0x70
>>> [ 23.093736] ? rtw_aes_encrypt+0x26f/0x290 [r8188eu]
>>> [ 23.093739] wait_for_completion_killable+0x19/0x30
>>> [ 23.093743] call_usermodehelper_exec+0x115/0x160
>>> [ 23.093747] __request_module+0x1ac/0x3e2
>>> [ 23.093764] rtw_aes_encrypt+0x26f/0x290 [r8188eu]
>>> [ 23.093778] ? rtw_get_stainfo+0xe6/0x130 [r8188eu]
>>> [ 23.093793] rtw_xmitframe_coalesce+0x950/0xb00 [r8188eu]
>>> [ 23.093799] ? _raw_spin_lock_irqsave+0x25/0x50
>>> [ 23.093812] rtw_hal_xmit+0x83/0x130 [r8188eu]
>>> [ 23.093826] rtw_xmit+0x258/0x5d0 [r8188eu]
>>> [ 23.093840] rtw_xmit_entry+0xe8/0x2e7 [r8188eu]
>>> [ 23.093845] dev_hard_start_xmit+0xa5/0x240
>>> [ 23.093849] sch_direct_xmit+0x150/0x340
>>> [ 23.093852] __dev_queue_xmit+0x2f6/0x910
>>> [ 23.093856] packet_sendmsg+0x945/0x1592
>>> [ 23.093860] ? attach_to_pi_state+0x18/0x110
>>> [ 23.093862] ? preempt_count_sub+0x60/0x90
>>> [ 23.093866] ? ep_item_poll.isra.1+0x40/0xc0
>>> [ 23.093871] sock_sendmsg+0x33/0x40
>>> [ 23.093874] __sys_sendto+0xee/0x160
>>> [ 23.093879] ? memzero_explicit+0xa/0x10
>>> [ 23.093883] ? urandom_read+0x120/0x270
>>> [ 23.093887] __x64_sys_sendto+0x24/0x30
>>> [ 23.093890] do_syscall_64+0x5b/0x170
>>> [ 23.093893] entry_SYSCALL_64_after_hwframe+0x44/0xa9
>>> [ 23.093896] RIP: 0033:0x7fac0b700c12
>>> [ 23.093897] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
>>> [ 23.093935] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
>>> [ 23.093938] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
>>> [ 23.093939] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
>>> [ 23.093940] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
>>> [ 23.093942] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
>>> [ 23.093943] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
>>> [ 23.096167] lib80211_crypt: registered algorithm 'CCMP'
>>> [ 23.096544] ------------[ cut here ]------------
>>> [ 23.096549] DEBUG_LOCKS_WARN_ON(val > preempt_count())
>>> [ 23.096557] WARNING: CPU: 7 PID: 495 at kernel/sched/core.c:3246 preempt_count_sub+0x5a/0x90
>>> [ 23.096561] Modules linked in: lib80211_crypt_ccmp amdkfd amd_iommu_v2 amdgpu nls_iso8859_1 nls_cp437 vfat fat r8188eu(C) lib80211 snd_hda_codec_realtek cfg80211 snd_hda_codec_generic edac_mce_amd chash snd_hda_codec_hdmi gpu_sched kvm_amd i2c_algo_bit ttm ccp snd_hda_intel rng_core drm_kms_helper kvm snd_hda_codec input_leds led_class joydev mousedev drm rfkill irqbypass snd_hda_core crct10dif_pclmul agpgart crc32_pclmul snd_hwdep ghash_clmulni_intel syscopyarea sysfillrect sysimgblt pcbc wmi_bmof snd_pcm aesni_intel snd_timer aes_x86_64 crypto_simd cryptd k10temp fb_sys_fops snd r8169 sp5100_tco pcspkr glue_helper soundcore mii i2c_piix4 rtc_cmos pinctrl_amd evdev gpio_amdpt wmi mac_hid acpi_cpufreq crypto_user ip_tables x_tables ext4 crc32c_generic crc16 mbcache jbd2 fscrypto sd_mod hid_generic
>>> [ 23.096604] usbhid hid ahci libahci xhci_pci xhci_hcd libata crc32c_intel usbcore scsi_mod usb_common
>>> [ 23.096613] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G WC 4.18.0-rc5-staging+ #1
>>> [ 23.096615] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
>>> [ 23.096618] RIP: 0010:preempt_count_sub+0x5a/0x90
>>> [ 23.096619] Code: 15 f7 46 c3 e8 a7 86 2d 00 85 c0 74 f6 8b 15 15 6b 5a 01 85 d2 75 ec 48 c7 c6 be fb e6 b9 48 c7 c7 6b ad e5 b9 e8 c0 77 fd ff <0f> 0b c3 84 d2 75 c9 e8 7a 86 2d 00 85 c0 74 c9 8b 05 e8 6a 5a 01
>>> [ 23.096647] RSP: 0018:ffff9d5581447c48 EFLAGS: 00010286
>>> [ 23.096650] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000001
>>> [ 23.096652] RDX: 0000000080000001 RSI: ffffffffb9e82096 RDI: 00000000ffffffff
>>> [ 23.096653] RBP: ffff959ef568a600 R08: 0000001cb3397218 R09: 00000000000003f3
>>> [ 23.096655] R10: ffffffffba5f7700 R11: 0000000000000000 R12: ffff959ef568a6ac
>>> [ 23.096657] R13: ffff959f0db9a000 R14: ffff959f15441000 R15: 0000000000000007
>>> [ 23.096660] FS: 00007fac0dcd9000(0000) GS:ffff959f1edc0000(0000) knlGS:0000000000000000
>>> [ 23.096663] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
>>> [ 23.096665] CR2: 00007fffc462efe8 CR3: 0000000206e88000 CR4: 00000000003406e0
>>> [ 23.096667] Call Trace:
>>> [ 23.096674] _raw_spin_unlock+0x16/0x30
>>> [ 23.096678] sch_direct_xmit+0x178/0x340
>>> [ 23.096684] __dev_queue_xmit+0x2f6/0x910
>>> [ 23.096689] packet_sendmsg+0x945/0x1592
>>> [ 23.096694] ? attach_to_pi_state+0x18/0x110
>>> [ 23.096696] ? preempt_count_sub+0x60/0x90
>>> [ 23.096701] ? ep_item_poll.isra.1+0x40/0xc0
>>> [ 23.096706] sock_sendmsg+0x33/0x40
>>> [ 23.096710] __sys_sendto+0xee/0x160
>>> [ 23.096715] ? memzero_explicit+0xa/0x10
>>> [ 23.096719] ? urandom_read+0x120/0x270
>>> [ 23.096724] __x64_sys_sendto+0x24/0x30
>>> [ 23.096728] do_syscall_64+0x5b/0x170
>>> [ 23.096732] entry_SYSCALL_64_after_hwframe+0x44/0xa9
>>> [ 23.096735] RIP: 0033:0x7fac0b700c12
>>> [ 23.096736] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
>>> [ 23.096763] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
>>> [ 23.096766] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
>>> [ 23.096767] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
>>> [ 23.096769] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
>>> [ 23.096770] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
>>> [ 23.096772] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
>>> [ 23.096775] ---[ end trace 8e7e0aecb937369e ]---
>>> [ 23.096792] BUG: using __this_cpu_read() in preemptible [00000000] code: NetworkManager/495
>>> [ 23.096795] caller is __local_bh_enable_ip+0x50/0x80
>>> [ 23.096798] CPU: 7 PID: 495 Comm: NetworkManager Tainted: G WC 4.18.0-rc5-staging+ #1
>>> [ 23.096799] Hardware name: Gigabyte Technology Co., Ltd. A320M-S2H/A320M-S2H-CF, BIOS F23d 04/17/2018
>>> [ 23.096800] Call Trace:
>>> [ 23.096804] dump_stack+0x5c/0x80
>>> [ 23.096808] check_preemption_disabled.cold.0+0x46/0x51
>>> [ 23.096812] __local_bh_enable_ip+0x50/0x80
>>> [ 23.096814] __dev_queue_xmit+0x450/0x910
>>> [ 23.096819] packet_sendmsg+0x945/0x1592
>>> [ 23.096823] ? attach_to_pi_state+0x18/0x110
>>> [ 23.096826] ? preempt_count_sub+0x60/0x90
>>> [ 23.096829] ? ep_item_poll.isra.1+0x40/0xc0
>>> [ 23.096833] sock_sendmsg+0x33/0x40
>>> [ 23.096835] __sys_sendto+0xee/0x160
>>> [ 23.096840] ? memzero_explicit+0xa/0x10
>>> [ 23.096842] ? urandom_read+0x120/0x270
>>> [ 23.096845] __x64_sys_sendto+0x24/0x30
>>> [ 23.096848] do_syscall_64+0x5b/0x170
>>> [ 23.096850] entry_SYSCALL_64_after_hwframe+0x44/0xa9
>>> [ 23.096852] RIP: 0033:0x7fac0b700c12
>>> [ 23.096853] Code: 48 83 ec 18 44 89 4c 24 08 e8 9a f5 ff ff 44 8b 4c 24 08 4d 89 f8 45 89 f2 89 c5 4c 89 ea 4c 89 e6 89 df b8 2c 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 3a 89 ef 48 89 44 24 08 e8 ca f5 ff ff 48 8b
>>> [ 23.096880] RSP: 002b:00007fffc46321b0 EFLAGS: 00000293 ORIG_RAX: 000000000000002c
>>> [ 23.096882] RAX: ffffffffffffffda RBX: 0000000000000011 RCX: 00007fac0b700c12
>>> [ 23.096885] RDX: 0000000000000148 RSI: 000055f8a5417c70 RDI: 0000000000000011
>>> [ 23.096886] RBP: 0000000000000000 R08: 000055f8a54154c0 R09: 0000000000000014
>>> [ 23.096888] R10: 0000000000000000 R11: 0000000000000293 R12: 000055f8a5417c70
>>> [ 23.096889] R13: 0000000000000148 R14: 0000000000000000 R15: 000055f8a54154c0
>>>
>>>
>>>
>>
>> Hi,
>>
>> I guess in addition to
>> Revert "staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames"
>>
>> this patch should also be reverted. I still get the above messages in dmesg.
>> With this [1] reverted dmesg looks good.
>>
>> [1]
>> 515ce733e86ee2e1bea4dba76d2d4491013d0f73
>> staging:r8188eu: Use lib80211 to encrypt (CCMP) tx frames
>
> Can you send me a patch to revert this?
Done. I hope it was not wrong to include the whole dmesg in the commit message.
Michael
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-08-05 20:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-14 17:54 [PATCH 1/2] staging:r8188eu: Use lib80211 to encrypt (TKIP) tx frames Ivan Safonov
2018-07-14 17:54 ` [PATCH 2/2] staging:r8188eu: Use lib80211 to encrypt (CCMP) " Ivan Safonov
2018-07-16 13:30 ` Michael Straube
2018-08-02 16:35 ` Michael Straube
2018-08-05 14:07 ` Greg Kroah-Hartman
2018-08-05 20:46 ` Michael Straube
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).