From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9A0D43B3E1 for ; Wed, 22 Jul 2026 21:53:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784757231; cv=none; b=p0FPatwJ6o1ZP45eExa3D+V2XXAWV6gWHcXqGck7YTw8j4ZC27adFIMVRMs/QsolH4Scx7E1iRd5wBW00hGst2p9wSIbAg/GbPysME7p5E6epZhDISF/97eI69nbjiWNPv+jZm11Yd4T/6Cqk4w2Tlk2aMpUkpmW2rkF6aW76vw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784757231; c=relaxed/simple; bh=kLsG8Cc7w4TGXx74DPmbKrg2eZnjyru909UpW2oVPFs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=q1bSsL01ZJ9AKhEFQPDy/dJNRzrS1QGmLesAWCubXPWpL3qs+ljYjDAipWsPkiscK8Y6bx9lViNyBu2eQTBocI+LKt8GUOlRXJxikMiDQt+fgqxVtVTJfrGLKSPLCv/LV4Q0i6294xTZ5lAiVbwaCvg2xn2BLWTZ62zVVvU9ohU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bHZFO13e; arc=none smtp.client-ip=209.85.218.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bHZFO13e" Received: by mail-ej1-f46.google.com with SMTP id a640c23a62f3a-c197e7e4e94so1295966b.2 for ; Wed, 22 Jul 2026 14:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784757226; x=1785362026; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to :content-type; bh=tVpjycweQEWnbKCET1u1aFSthym50+THgVbqZ1JnaPk=; b=bHZFO13e8mvkcZsO7iUMtiYqs7gzYs2nUfy2NbW6yyTgH5uN6zsn4zn7jImyX2/bB2 C6zBkEClMlUulujajDQlvmorS08KuJT2t/rnu0ZoFQJIjXjlm4z0Se8GEzG+7Efjz9Hi Y3/ZpQJs4ndl8jJLPXTNsOtGZhKtSx5otKZrKDCkk2t1dmGr9ENupvnURzcHh9rg08vm 0Ef5m0HfVVSaBj0+McbaH/FN5nv9Fz7T+0ZpToi/HcuKBt1H8rseelNrWeMCLOsLkZLa Mt6w4aTvLsL4G+HTFYym2/0j7F7jLjinF3VaCs1g9ZB4ChYB94RWuuHd383kTMFj+9TS b8bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784757226; x=1785362026; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=tVpjycweQEWnbKCET1u1aFSthym50+THgVbqZ1JnaPk=; b=s0AoQ6jDgcjy66diM+EbGFyLaRfqi+4ivVQUtgY/aU1Skycrr1CRxW60psPbkZvGo3 26a51uXLUupF5+EIayRRbBwim6fbWuJJNZHrK4BUt6+Sed9KZOaegoNPgHvgVX664dEU WhojoaIypGJ+23eHo9NF2qmA2qYh1CAyWFKfHm6USaLdVu+Bw5iQf9v+qI6FlGPLUmUm SdAWENSMc2gsj8PA07f1JpcLDiadra8GdVE9j575VL2t41cGV7cWIjSjCSucFY4fi2UE 80YnxmgO6acL+vX8ElO3smOPy8SuMJxFomTA3HcX8z8y/CDACXZUPp8ILAES19/nu5dE aKRQ== X-Forwarded-Encrypted: i=1; AHgh+RpjX90fwQpwwBHOSbAtEkRBWqw3yWNhvfPgF2Hbh9oK13UyzbC3eBb5aqx89BmZYJrp3sQ5ZoP9KEDobfg=@vger.kernel.org X-Gm-Message-State: AOJu0Yze9RPhMOrK0P2S7eEoJvIMnotsphlK3VW3U5p03kHQIS/iSNcy w+dQLjWnd/uuSo3XIM16otfu4J4Yw22f6tshauwZDZt3/70A7vdl/hLg X-Gm-Gg: AR+sD10OgGjrJ0rjpBUaTBrpL41xe1YGSm9/ICjEKWocUUv/2Nyf9a0UHPK5N343WJn iXNvulZff2hCTYWvA5wbxZUx75ZQ8NvGP0xQXxNaYWhsBVwltDRBDyd3Vxt0iu3Q1NMLlUdSDIM Urm8btIcoRXpkUFE3KfgrprDkjoyc130ARS91vaE35X4Z4rc6Wtu0z+Wn6vS4uC2SAjbBb/OA1z h5XzzInPi7llz+ye7E64uH7D3R2J7GslBT359ApEXiYEYMB7KBqwuU9kuXYZmc+uCnDSyFTW4D+ Txew657b+69knYSqhprA1vwhaIrKwHgIAIpWBv1PNqp1nYdB8CMyj4Y1LLThgFYDKkfYI/4E7pM vH6rpqULeNISdarxHRFOizOp0DUxzn+kdy0iBbNCQBkJflW87I77ZWDn3yJwIiW/nehwPoO1fCn /buthxHnSp4OYS+7CJlzfW0VChBi+oqBuEv4f7QrmOe+1PwDNkljCy/jW+Rgj6kdvj X-Received: by 2002:a17:907:e1ca:20b0:c16:14d1:b529 with SMTP id a640c23a62f3a-c1c5092f0d2mr16761066b.18.1784757226140; Wed, 22 Jul 2026 14:53:46 -0700 (PDT) Received: from DESKTOP-LO2SIVE.localdomain (83.4.116.191.ipv4.supernova.orange.pl. [83.4.116.191]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c1c32c90b4dsm151764366b.35.2026.07.22.14.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 14:53:45 -0700 (PDT) From: =?UTF-8?q?Patryk=20Gawro=C5=84ski?= To: gregkh@linuxfoundation.org Cc: =?UTF-8?q?Patryk=20Gawro=C5=84ski?= , Dan Carpenter , Ethan Tidmore , Lin YuChen , Maksym Pikhotskyi , Michael Straube , Sameeksha Sankpal , Artur Stupa , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH] staging: rtl8723bs: Replace custom RotR1 macro with ror16 Date: Wed, 22 Jul 2026 23:53:25 +0200 Message-ID: <20260722215327.62791-1-gawronski1.6@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The custom RotR1 macro reuses its argument, which throws a checkpatch warning and can lead to unexpected side-effects if called with an expression that has side-effects. Remove the custom macro and replace its usages with the standard kernel ror16() function from to clean up the code. Signed-off-by: Patryk GawroĊ„ski --- drivers/staging/rtl8723bs/core/rtw_security.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c index 29e2a5a771dd..2217cffac5f2 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -6,6 +6,7 @@ ******************************************************************************/ #include #include +#include #include #include #include @@ -225,7 +226,6 @@ void rtw_seccalctkipmic(u8 *key, u8 *header, u8 *data, u32 data_len, u8 *mic_cod } /* macros for extraction/creation of unsigned char/unsigned short values */ -#define RotR1(v16) ((((v16) >> 1) & 0x7FFF) ^ (((v16) & 1) << 15)) #define Lo8(v16) ((u8)((v16) & 0x00FF)) #define Hi8(v16) ((u8)(((v16) >> 8) & 0x00FF)) #define Lo16(v32) ((u16)((v32) & 0xFFFF)) @@ -392,12 +392,12 @@ static void phase2(u8 *rc4key, const u8 *tk, const u16 *p1k, u16 iv16) 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]); + PPK[0] += ror16(PPK[5] ^ TK16(6), 1); + PPK[1] += ror16(PPK[0] ^ TK16(7), 1); /* Use all of TK[] in Phase2 */ + PPK[2] += ror16(PPK[1], 1); + PPK[3] += ror16(PPK[2], 1); + PPK[4] += ror16(PPK[3], 1); + PPK[5] += ror16(PPK[4], 1); /* 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 */ -- 2.55.0