From nobody Thu Jun 18 20:03:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12D0CC433F5 for ; Thu, 14 Apr 2022 10:43:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242406AbiDNKqT (ORCPT ); Thu, 14 Apr 2022 06:46:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241998AbiDNKqN (ORCPT ); Thu, 14 Apr 2022 06:46:13 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DED446FA2A for ; Thu, 14 Apr 2022 03:43:48 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id s25so5337533edi.13 for ; Thu, 14 Apr 2022 03:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WFWSbvyg+22b/MTXpAJu7hFpGo/4sj3aFOsTXUdx0xU=; b=QyV2bqbB67CEvoWLL+KxlN8vK+MHpp1Sd1EBlVNcejR3Jac427hCRQNr4Sg17bXh5J 5pBDvjAs0EYgGiLDKqkIS9ihJtHNmxqrMU2M0n5DIEdcY8eyLb1Si4mhVD7Wx7OP4RMU r8YlaMAaPkX7YDyqH5H4KdcWalyHglva0b58jrZP3lxhKQfjwgrj1KZIYWVxiHG2mMty cvFK7XMq7+KvMg8vIxRwTjAWTzXFhBMZoEjO7CfgSEjA19j5h7wdcR+B9FU1zpct42I3 ZCjM9kAeyrUlgVVBQfZIjcCsGjqLRuNsjKAHhOxUADOPkqW1+wVPXNt1BkMMw/AhWPcO zmqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WFWSbvyg+22b/MTXpAJu7hFpGo/4sj3aFOsTXUdx0xU=; b=aVIdr+IkKWwHMPxp7ICYWQxKa4rPXWfuQn3Tmw1QdeyFfMbxp3QJFwET40QC5e98q5 VKrO4Fx8HnJKQ/i3wJijRm5k7khyVrnPJOUkebUXTKg0x7fLit3fudjkUhcwfQamJL3J 2FkRdUCR6Vcgf7AM/+MVgFX6CalmbO+jHaQm2WQUZ6VXFfZQ6xFAFgE1zFm0wW/NUtGS qkZWc4rhDtce6FgJk6AT1hj0UYfWfiLxEcqMi8IAFoYvDCK40FxAX/4DYAVC3MQMJOv2 yBaDtreaTV2EjyXyKvXh//02rfBG/TLhbeiabLct/PSkWxBBq9tqUIQ8gVpqhQmquBCZ yt8w== X-Gm-Message-State: AOAM531GeGtcgbyXtCQQM8oCH2kb1032U4QrNEtd6Yevv/tKdAeQMiIn YQvA4Rcq1oZ52rz4nSY/Zlo= X-Google-Smtp-Source: ABdhPJwo5OS8VI7zAySQPUrSJFOPG8ga1uuwWy1rlKpZKAVE0RwTl6dsqS/eI1kUmqChDbVRmgbXRA== X-Received: by 2002:a05:6402:4407:b0:421:21be:376b with SMTP id y7-20020a056402440700b0042121be376bmr1583976eda.294.1649933027522; Thu, 14 Apr 2022 03:43:47 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id h9-20020aa7c949000000b0041b4d8ae50csm821318edt.34.2022.04.14.03.43.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 03:43:47 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 1/8] staging: r8188eu: fix struct rt_firmware_hdr Date: Thu, 14 Apr 2022 12:43:16 +0200 Message-Id: <20220414104323.6152-2-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414104323.6152-1-straube.linux@gmail.com> References: <20220414104323.6152-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The structure rt_firmware_hdr is wrong, there are two issues. The first issue is that the size of struct rt_firmware_hdr is 33 bytes but the header in the firmware file is 32 bytes long. The hexdump of rtl8188eufw.bin shows that the field Rsvd1 of struct rt_firmware_hdr should be u8 instead of __le16. OFFSET rtl8188eufw.bin ----------------------------------------------------------- 0x00000000 E1 88 10 00 0B 00 01 00 01 21 11 27 30 36 00 00 0x00000010 2D 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 0x00000020 02 45 4E 00 00 00 00 00 00 00 00 00 00 00 00 00 0x00000000 E1 88 10 00 0B 00 01 00 01 21 11 27 30 36 00 00 ^ ^ ^ ^ ^ ^ Subversion Rsvd1 Month Date Hour Minute This was figured out by looking at struct rtlwifi_firmware_header in drivers/net/wireless/rtlwifi/wifi.h and the firmware file that the rtlwifi/rtl8188ee driver uses. The second issue is that the u16 and u32 fields sould be __le16 and __le32. Change the field Rsvd1 to u8 and the u16, u32 fileds to __le16, __le32. Both issues had no effect because the header size is actually hardcoded to 32 where it is used in the code. Also the fields after Subversion are not used and the bytes of the u16 and u32 fields are all zero. Fixes: 7884fc0a1473 ("staging: r8188eu: introduce new include dir for RTL81= 88eu driver") Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 8620f3c92b52..7cd08268f3b9 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -29,7 +29,7 @@ struct rt_firmware_hdr { * FW for different conditions */ __le16 Version; /* FW Version */ u8 Subversion; /* FW Subversion, default 0x00 */ - u16 Rsvd1; + u8 Rsvd1; =20 /* LONG WORD 1 ---- */ u8 Month; /* Release time Month field */ @@ -42,11 +42,11 @@ struct rt_firmware_hdr { =20 /* LONG WORD 2 ---- */ __le32 SvnIdx; /* The SVN entry index */ - u32 Rsvd3; + __le32 Rsvd3; =20 /* LONG WORD 3 ---- */ - u32 Rsvd4; - u32 Rsvd5; + __le32 Rsvd4; + __le32 Rsvd5; }; =20 static void fw_download_enable(struct adapter *padapter, bool enable) --=20 2.35.1 From nobody Thu Jun 18 20:03:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A3B5C433EF for ; Thu, 14 Apr 2022 10:44:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242412AbiDNKqW (ORCPT ); Thu, 14 Apr 2022 06:46:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242387AbiDNKqO (ORCPT ); Thu, 14 Apr 2022 06:46:14 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B04916EC77 for ; Thu, 14 Apr 2022 03:43:49 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 11so783977edw.0 for ; Thu, 14 Apr 2022 03:43:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SjWebb0xz2JlPboqiHF18jFOy9xu4u7Sl1Xjhzt8LEw=; b=fQu9zVhyLfSvkDTiVKK35W3kogpJHHy8JcRjdvY7yUh85D1JHhkyeWvqrBnKjAVAwR hXERnHr8RPNFs2iKyRJ9cO+jGHB67q6bNMfUOU5sYYI5r3Rre8eC9cp1p6L/wGKMcIDN FSlB3P/RIRODBtayPyIqYDT1IqKwlFjHuvYAUOFBsZHDJ3Z3xye+wLsf+Vlsgoa2+QV7 siw3OFi7YgGzHONajSRxSz4K+fhJIelu8i6pxNwQTRG0IXfIUTBkTRYCQyLlhvkAZh1d iyUwvDtlB0Ox6Zt1kCz4hBtadcabdsTCvt3j1eL1mmjWvSqi01Ehp+RJIegNvYXbJZN2 wE4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SjWebb0xz2JlPboqiHF18jFOy9xu4u7Sl1Xjhzt8LEw=; b=AuaRYceKX/ZtL/uR4NAemUIhSPOziqiBwwC4++iAb41E8P1T+JIFVJZIa2eOqljmYQ 6DohQy7Jy2Iqh2xVqUf7ATJIc8tObIZI9o7/IE6cwO3EYgk9zVQFuVVZxGcPjrkG74fA YUPYlbXOYOQSjC+hQJTfAj9C0w0c6bn/gk5TjVL9g8DJABKTgQm+K8YMOovSc6/PWYXw DeG2i7owWKWuqNEK3ZNS2MdeAzRMPAG7cgQaKBYvGkTmQqynxo5cKRRrFpLZZWzzjC2P dUJ1udQw5D4Vz1adAY6JXpPF6S5z91qKxlUEHxUkKh9P18X2oSu6X3KoWdVQFeHKgP72 Hgdw== X-Gm-Message-State: AOAM532IrvMYWqFX8XuG7cgHnnkfFaQf9UfDHtD2V9aCWUB9BbFHzlUb 1P+TTwQbITXRK5kAPlx5lZ4= X-Google-Smtp-Source: ABdhPJwdyJBKaw+6ezo0DN2iI5ToAsHEhtUcQb+bNDgAmdGF+YPAyeOrPuGaSFxaoJ/SA/673FxfRA== X-Received: by 2002:a50:e696:0:b0:419:998d:5feb with SMTP id z22-20020a50e696000000b00419998d5febmr2294868edm.122.1649933028339; Thu, 14 Apr 2022 03:43:48 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id h9-20020aa7c949000000b0041b4d8ae50csm821318edt.34.2022.04.14.03.43.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 03:43:47 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 2/8] staging: r8188eu: clean up comments in struct rt_firmware_hdr Date: Thu, 14 Apr 2022 12:43:17 +0200 Message-Id: <20220414104323.6152-3-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414104323.6152-1-straube.linux@gmail.com> References: <20220414104323.6152-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The comments in struct rt_firmware_hdr are not needed. Remove them. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 37 ++++++++------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 7cd08268f3b9..323e0c634c4e 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -14,37 +14,22 @@ (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x2300 || \ (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88E0) =20 -/* This structure must be careful with byte-ordering */ - struct rt_firmware_hdr { - /* 8-byte alinment required */ - /* LONG WORD 0 ---- */ - __le16 Signature; /* 92C0: test chip; 92C, - * 88C0: test chip; 88C1: MP A-cut; - * 92C1: MP A-cut */ - u8 Category; /* AP/NIC and USB/PCI */ - u8 Function; /* Reserved for different FW function - * indcation, for further use when - * driver needs to download different - * FW for different conditions */ - __le16 Version; /* FW Version */ - u8 Subversion; /* FW Subversion, default 0x00 */ + __le16 Signature; + u8 Category; + u8 Function; + __le16 Version; + u8 Subversion; u8 Rsvd1; - - /* LONG WORD 1 ---- */ - u8 Month; /* Release time Month field */ - u8 Date; /* Release time Date field */ - u8 Hour; /* Release time Hour field */ - u8 Minute; /* Release time Minute field */ - __le16 RamCodeSize; /* The size of RAM code */ + u8 Month; + u8 Date; + u8 Hour; + u8 Minute; + __le16 RamCodeSize; u8 Foundry; u8 Rsvd2; - - /* LONG WORD 2 ---- */ - __le32 SvnIdx; /* The SVN entry index */ + __le32 SvnIdx; __le32 Rsvd3; - - /* LONG WORD 3 ---- */ __le32 Rsvd4; __le32 Rsvd5; }; --=20 2.35.1 From nobody Thu Jun 18 20:03:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43CE5C433F5 for ; Thu, 14 Apr 2022 10:44:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242428AbiDNKq0 (ORCPT ); Thu, 14 Apr 2022 06:46:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242388AbiDNKqO (ORCPT ); Thu, 14 Apr 2022 06:46:14 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A61C476E07 for ; Thu, 14 Apr 2022 03:43:50 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id bh17so9215543ejb.8 for ; Thu, 14 Apr 2022 03:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SVFAJRqd3IbNMgTMyXPpJtbL2G7uewgHBXHJSIvHW0o=; b=IQXu4G7VB/lBprrrqnvy0EFMgzp4m0fuumcZSfkzmo51m7RidJsYX1OUJKR+GrS5uf K7Du1GJqU2Ih2fGpbIglxzxwD7OFDD429qy1+tV3HK3a/lAzidWttUvytM9h+f+IplaB fI4gdZ1vSE8Um+/Fqu/Ev4rISOW0FPIW/84jd0N8RIlnhXOf7N4grx7SXk/g7dmPW62r jWfOWzYCHkQF1TNN/B2cYJNt3evtciPBcWkXqv+JyF7OGzT6CLy4Ozx8UFArACVEza6p xNXzp7NqQ/Op2ar0TSICEPe5suyvULHECcF199xJNAeKG0fOzmR2kP5oN3StQuYWhhAi i4sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SVFAJRqd3IbNMgTMyXPpJtbL2G7uewgHBXHJSIvHW0o=; b=mw6/Cw3gd1lYtxDTRI1MN1SJSPZYpPNFIwWxmUmbZOpyhMldXr14Jn85V8Q87oqRxn g2ip1HpG6mDuIzl1IqaPw+mofYO1PoiOcB418B6ezupSENEINSIMoRIM/J1uItJuX8Ne k0dbRuHCiflZlK4Nt8McHb0KN0LdNzHQdrdYea7llg6TXsDsmgsuwKK74zyrta4cRrAb dDLVQIFI3mgl7EBaH3oDYHy6PCBKVsiSx75wufpbihtdiLno8GiN5Fy7z2xBFbRQy39A ArE0icUCKoKtfxjQ+pnHD3jGveBp1rLcpLtHOsaMVWN04xagGvqd9RAv8KrWjc/kn8Zb vDUQ== X-Gm-Message-State: AOAM531Z9mQ1chZCxSexcQ+67ZhNa3zvWHpEfZz0c9by3zmAY4zNJDQK KxmC38QfFD2P8ezm4Be/LvE= X-Google-Smtp-Source: ABdhPJzgdAz9F9MyKUwu5c/4hKYUqDjZghCnkVZvfpNjUV/JtPkaVUFpEG2Y2gLqeK3Cg1DbS8kcgg== X-Received: by 2002:a17:907:2daa:b0:6da:924e:955 with SMTP id gt42-20020a1709072daa00b006da924e0955mr1755904ejc.1.1649933029113; Thu, 14 Apr 2022 03:43:49 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id h9-20020aa7c949000000b0041b4d8ae50csm821318edt.34.2022.04.14.03.43.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 03:43:48 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 3/8] staging: r8188eu: rename fields of struct rt_firmware_hdr Date: Thu, 14 Apr 2022 12:43:18 +0200 Message-Id: <20220414104323.6152-4-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414104323.6152-1-straube.linux@gmail.com> References: <20220414104323.6152-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Rename the fields of struct rt_firmware_hdr to avoid camel case. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 48 +++++++++++++-------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 323e0c634c4e..3da52a1ba23c 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -9,29 +9,29 @@ #define MAX_PAGE_SIZE 4096 =20 #define IS_FW_HEADER_EXIST(_fwhdr) \ - ((le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x92C0 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88C0 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x2300 || \ - (le16_to_cpu(_fwhdr->Signature) & 0xFFF0) =3D=3D 0x88E0) + ((le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x92C0 || \ + (le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x88C0 || \ + (le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x2300 || \ + (le16_to_cpu(_fwhdr->signature) & 0xFFF0) =3D=3D 0x88E0) =20 struct rt_firmware_hdr { - __le16 Signature; - u8 Category; - u8 Function; - __le16 Version; - u8 Subversion; - u8 Rsvd1; - u8 Month; - u8 Date; - u8 Hour; - u8 Minute; - __le16 RamCodeSize; - u8 Foundry; - u8 Rsvd2; - __le32 SvnIdx; - __le32 Rsvd3; - __le32 Rsvd4; - __le32 Rsvd5; + __le16 signature; + u8 category; + u8 function; + __le16 version; + u8 subversion; + u8 rsvd1; + u8 month; + u8 date; + u8 hour; + u8 minute; + __le16 ramcodesize; + u8 foundry; + u8 rsvd2; + __le32 svnidx; + __le32 rsvd3; + __le32 rsvd4; + __le32 rsvd5; }; =20 static void fw_download_enable(struct adapter *padapter, bool enable) @@ -254,9 +254,9 @@ int rtl8188e_firmware_download(struct adapter *padapter) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - fw_version =3D le16_to_cpu(fwhdr->Version); - fw_subversion =3D fwhdr->Subversion; - fw_signature =3D le16_to_cpu(fwhdr->Signature); + fw_version =3D le16_to_cpu(fwhdr->version); + fw_subversion =3D fwhdr->subversion; + fw_signature =3D le16_to_cpu(fwhdr->signature); =20 if (!log_version++) pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", --=20 2.35.1 From nobody Thu Jun 18 20:03:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69B58C433F5 for ; Thu, 14 Apr 2022 10:44:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242434AbiDNKqa (ORCPT ); Thu, 14 Apr 2022 06:46:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242391AbiDNKqQ (ORCPT ); Thu, 14 Apr 2022 06:46:16 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5357778934 for ; Thu, 14 Apr 2022 03:43:51 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id c64so5776532edf.11 for ; Thu, 14 Apr 2022 03:43:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/gsZkfzMYeP6pd9u0lclNFF+p8O0+cqjChmSOXbRt/s=; b=IewDFGHfG/ljKouP909yUMkKnfqkQGLCtZ1vhKDaWpkKh+VVEliNxHU0c5L8V2ErxN TRn3nGEC1Q9WAtYW/uGXjuoScxaqRDA+GhxMuk1UJOoTQpkPYdtO4nAGNaVzDQwquJM5 XeSMg9kM7lwxMvv+RNtvVaySj/9CmphfwB8tajknVt13Z4/w8zU1pAJo4z+cbZctGCWZ nfpdTZrurFFZ6N5uSMNX/IIA78hlc4FO26vPlaN+PSfjwA9mP7TYJuAsxza3wqfdddq6 3wU4Uh1NlWdDmjQckButG3ucZS57D4e/uDZdBegOZKF+D3u93ViHW5Du/+0XvT8vfnZR 6AYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/gsZkfzMYeP6pd9u0lclNFF+p8O0+cqjChmSOXbRt/s=; b=N1IAPTnoIjy2PshKn+B6iq7bXop0OmWP1I97Mhwax1HD8+hHo85aOf7oqW/lbfk7C/ bSkrya4T5Fs9K2TEsr4ERUNYTV7EZO40LAn4jugsS/nl6IXcGuoZYFbbKM4Gdb9I71oS dYfXYDvzpcXxccMVHi4jt0UTwjol81wzdx+hUdwF3OGDycVulruP+6eQ70s45j1smv04 +KjTKH7XHpsC1LJytJcblmS4aiKoZoLr9UttaeKKRihFOmeiLoChXyqhu2TUSRXmVP9b zOswPYaAZTsdu6mElRlcQXrXpvNsfVS5e7z6HymAvKKioHUkaaQj42GRyjzqGcZxkl+A 0DQw== X-Gm-Message-State: AOAM532r0kBVqp+or47biBW4n5CGMyYqajAO0nhcAG5uZUugQxJd9h2H BkPAOSsitNZBRJW0xmNGc/Y= X-Google-Smtp-Source: ABdhPJzo72aDyiS8Zt0ChKhuI/D5Raosh8XxvW6NynlopdOy/tC2lH2pCJ99HTMvZDPhweq46RjxWg== X-Received: by 2002:a05:6402:e96:b0:41d:1a0f:e70a with SMTP id h22-20020a0564020e9600b0041d1a0fe70amr2251748eda.411.1649933029957; Thu, 14 Apr 2022 03:43:49 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id h9-20020aa7c949000000b0041b4d8ae50csm821318edt.34.2022.04.14.03.43.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 03:43:49 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 4/8] staging: r8188eu: use sizeof instead of hardcoded firmware header size Date: Thu, 14 Apr 2022 12:43:19 +0200 Message-Id: <20220414104323.6152-5-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414104323.6152-1-straube.linux@gmail.com> References: <20220414104323.6152-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Use sizeof() instead of hardcoding the firmware header size. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 3da52a1ba23c..94526064f29b 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -263,9 +263,8 @@ int rtl8188e_firmware_download(struct adapter *padapter) DRIVER_PREFIX, fw_version, fw_subversion, fw_signature); =20 if (IS_FW_HEADER_EXIST(fwhdr)) { - /* Shift 32 bytes for FW header */ - fw_data =3D fw_data + 32; - fw_size =3D fw_size - 32; + fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); + fw_size =3D fw_size - sizeof(struct rt_firmware_hdr); } =20 /* Suggested by Filen. If 8051 is running in RAM code, driver should inf= orm Fw to reset by itself, */ --=20 2.35.1 From nobody Thu Jun 18 20:03:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73F83C433EF for ; Thu, 14 Apr 2022 10:44:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242441AbiDNKqf (ORCPT ); Thu, 14 Apr 2022 06:46:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241968AbiDNKqQ (ORCPT ); Thu, 14 Apr 2022 06:46:16 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 272DF6FA2A for ; Thu, 14 Apr 2022 03:43:52 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id t25so5790919edt.9 for ; Thu, 14 Apr 2022 03:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HMcu7zgQS9k0Bz6hvTLZm8qcxNG9rHsrt5l+a1uteew=; b=owKXAll23qDyqfo0QPXWSi6YM2YVa3BJCIc6zCarnqr1bxlbxBIHIcuTsDXNO7AXTY JMzA8cAcsb92yA9yn5mnNvwoAucOL94HWDzJBgfuJ6lyU9oSekQkwNSq1Dewe60BkKtD 1UJUSqy9rbGNvD1WaUU1Sjfqgt5Qthp4UAfLp9yWgk0GmAjedZ8kTC5vkYSWihKiUjsv P2iEA0tT9odaJQqe/6kMyY77vdJGPSc+fkYqkN0g7KkCrH22rgqU6Cffs3dEtAwrSHj/ H0z4Oclyz9sDlEz58wu/9+io5GvaqbCjNIM2si6pTMb//L6tuLUKdI/57PhUbP8IL1hE wcCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HMcu7zgQS9k0Bz6hvTLZm8qcxNG9rHsrt5l+a1uteew=; b=BQeKtZ3IIg6WHXMWVL8U0BUql1zYYZ7hTn9VfaoLSRCjEYqzdSsPzHFFZ304Wmmtjt rQuyXmZwOh82KMIhT3yoV05kilb6cx9UkBl8NvwCzUX4H6Yq2VYNeezQPT5TteM8nT0a 8vJvRWTjhe6enZr7Li7HVAc3WAyysaLYWrYlReGCOSPslmuQLne8H3c04A7Q1ag4giRy KstDohO5f8Y+NGITQOfwd9m5XSwOyXXL6ZItV8J8l0BtWfdLlkY22SKbrq9fX8NkP8uq o5yzrx3paUtd5gCBIqEihfNlX1spwh5N3fS8fqQ9KtRF6t2wrp74t+gw64AR4wXx07Ag 7T5A== X-Gm-Message-State: AOAM531IChLLYz3ByqW/uDfnhp5GB7yKt6zsuXPmyx/vvSHHECsGFbAR MyFzG4iptzbmyQgdOeVhzyM= X-Google-Smtp-Source: ABdhPJwH3JmT4QONevs0qREw8ct63mE8YvnUqehS0MI05unk99lQFWNO6+xk90GjMwWJvw0mGY30+w== X-Received: by 2002:aa7:dc49:0:b0:41d:72e2:d34e with SMTP id g9-20020aa7dc49000000b0041d72e2d34emr2211955edu.385.1649933030803; Thu, 14 Apr 2022 03:43:50 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id h9-20020aa7c949000000b0041b4d8ae50csm821318edt.34.2022.04.14.03.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 03:43:50 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 5/8] staging: r8188eu: remove variables from rtl8188e_firmware_download() Date: Thu, 14 Apr 2022 12:43:20 +0200 Message-Id: <20220414104323.6152-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414104323.6152-1-straube.linux@gmail.com> References: <20220414104323.6152-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The local variables fw_version, fw_subversion, fw_signature in rtl8188e_firmware_download() are only used in one place. Use the assigned values directly and remove the variables to make the code shorter and cleaner. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 94526064f29b..cbc4980bd938 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -237,7 +237,6 @@ int rtl8188e_firmware_download(struct adapter *padapter) struct dvobj_priv *dvobj =3D adapter_to_dvobj(padapter); struct device *device =3D dvobj_to_dev(dvobj); struct rt_firmware_hdr *fwhdr =3D NULL; - u16 fw_version, fw_subversion, fw_signature; u8 *fw_data; u32 fw_size; static int log_version; @@ -254,13 +253,10 @@ int rtl8188e_firmware_download(struct adapter *padapt= er) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - fw_version =3D le16_to_cpu(fwhdr->version); - fw_subversion =3D fwhdr->subversion; - fw_signature =3D le16_to_cpu(fwhdr->signature); - if (!log_version++) pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, fw_version, fw_subversion, fw_signature); + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); =20 if (IS_FW_HEADER_EXIST(fwhdr)) { fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); --=20 2.35.1 From nobody Thu Jun 18 20:03:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8484AC433F5 for ; Thu, 14 Apr 2022 10:44:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242446AbiDNKqi (ORCPT ); Thu, 14 Apr 2022 06:46:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242396AbiDNKqR (ORCPT ); Thu, 14 Apr 2022 06:46:17 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC52876E07 for ; Thu, 14 Apr 2022 03:43:52 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id lc2so9172523ejb.12 for ; Thu, 14 Apr 2022 03:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UqSU6uGvzefM7JqsLVkp47vheVpreBM8RRaia816jV8=; b=EPhy7/ZQXKLEPglQ9Yf7BZJg6s4m0VoAeydJ8uetqwmPJkMPW0qIKvJPGEozN6rXhh zyuuilCGrBMBf1ixfkTEA8b+SX2c6ibg0Aykjpl2XN6xMCR9U08O3IjiEN07Zp3+meGl d5b1N6r5ThgRE1pjcSjhXhKVdazk9hncQrFUMCeBhNPQ62DCSQr2kfeZqKMRmRSuaCgS Rkz3lg2wlheg88U7MRcNRhUWfpnQpmzBuvpoZoME7oa+rwU6Q1wlkNtOmLd2BZMWl2f2 uZ8ITrN4hNmdwW2KxCr8Hq02Tnn6cJ/fOhKutv/9mIFXg9RaMnphybn8JOqn5ZZhpach thWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UqSU6uGvzefM7JqsLVkp47vheVpreBM8RRaia816jV8=; b=6sHtYKsl/PhUDopJ12MlfJHf/0zeKalU7ag8QyO0w/Q7mTwdoxa4lZIeEw6GW+rO9F G25iI5V+5IMHgKtRZTKfOonu+GRnpO6O1jAkNHEPPa5XhERc6hOIe6prZmY/Z6Y1N1RS Zft8Ms8BxpQ3be2nGWBXwEKuAHl+J+5m4BxDuxxRgZloVIeiGij2FbJRf+7KJCUA+/yF nmH2kOCTOeMKkGMG6EygGSq+FG6Pqh6tbEtsnkhZ8XGQNM0ZdgS8JVxJVgjXB2SgmhJ+ MiDkBEflWGnD0h6ukousWpLB0EIePZ0Qsp2j0svTA+YT4N4dQuQ/THDYx30nJNyER5wI 98Uw== X-Gm-Message-State: AOAM532/lmGXMig+hGNeVZfj2CpUNP4BQvUic2wcNets7Px7YyCPsWd2 xnRcHoNc5eNIlokWzeCYFak= X-Google-Smtp-Source: ABdhPJwsbeir2WfwtRfQ2AKmGoQyu5tVJfNVyMmQ69tQEtA+fV69250Ivp0T1qS4N5lXuXJN5/oxoQ== X-Received: by 2002:a17:906:b107:b0:6e0:a25a:af6e with SMTP id u7-20020a170906b10700b006e0a25aaf6emr1755104ejy.359.1649933031568; Thu, 14 Apr 2022 03:43:51 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id h9-20020aa7c949000000b0041b4d8ae50csm821318edt.34.2022.04.14.03.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 03:43:51 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 6/8] staging: r8188eu: always log firmware info Date: Thu, 14 Apr 2022 12:43:21 +0200 Message-Id: <20220414104323.6152-7-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414104323.6152-1-straube.linux@gmail.com> References: <20220414104323.6152-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The local static variable log_version prevents logging the firmware information more than once, e.g. when the device is unplugged and plugged again. That is not necessary and complicates the code. Remove it. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index cbc4980bd938..64963507a346 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -239,7 +239,6 @@ int rtl8188e_firmware_download(struct adapter *padapter) struct rt_firmware_hdr *fwhdr =3D NULL; u8 *fw_data; u32 fw_size; - static int log_version; =20 if (!dvobj->firmware.data) ret =3D load_firmware(&dvobj->firmware, device); @@ -253,10 +252,9 @@ int rtl8188e_firmware_download(struct adapter *padapte= r) /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - if (!log_version++) - pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, - le16_to_cpu(fwhdr->signature)); + pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); =20 if (IS_FW_HEADER_EXIST(fwhdr)) { fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); --=20 2.35.1 From nobody Thu Jun 18 20:03:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEDFCC433EF for ; Thu, 14 Apr 2022 10:44:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242398AbiDNKqn (ORCPT ); Thu, 14 Apr 2022 06:46:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242401AbiDNKqS (ORCPT ); Thu, 14 Apr 2022 06:46:18 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA0DD6FA2A for ; Thu, 14 Apr 2022 03:43:53 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id u15so9178120ejf.11 for ; Thu, 14 Apr 2022 03:43:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vkswkCkzkfuTkcC/MPeEn0SGFUoxOD74D06SLg3Ufn0=; b=iWlnSum74zWq9k1VdmcjywmgcKKEeTiTo4Edj/3kWQ3mphEoEhp54slxtjXphSS4Ux Tpk8EmwCVTNLptsx6NjCrpCHDZNQ6jSd3E0+BxBZKWJAwwAyueP/wF6bVeJ4QWImzNJh mXraTy9ukq5tEigcDXYUDA4mmw6GMy68jysVh/0OJL6KTe0dJ4TtmnPgAUDzqLclV2ed giaDgrGU8qvaCkc+qfCzSWTPLexpbph+DQdzOg2D0ZPkMl8lYFBT0J6y08Bp42oBp0jz S/ArhcDel9UqRBcFQMtELR3H72iCq16zeHJhOqrC+G4idVxp8wD/7MtPIlh64Q+YLcOS cN2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vkswkCkzkfuTkcC/MPeEn0SGFUoxOD74D06SLg3Ufn0=; b=fzlL3PkD9He3w5KqMa0Q4bdU9QGObDapXDtuMEY/gsNriAUSMIEnkAkiYThTKO2j7n XKMGGdupitmxVCi2EpVS/jG9Mcm5s4b6XH994dpklFy+Thv+qnDa2CHqYVTfli/FzzKW DWevcYHTchayDcx+GQcODm4CcYdKSyLSJCpIrO8MVDD7AY6VM5eYWYOKkmile68L/mlf BdDoWrOi3C4b/OpHiOxa1AlNarrSKmGzSTm59jbt8HcXU8XJKH+SLnhmcIP6Bn1OT+vq EWnx4TSwGTU92lD7M5MLQGfEsHDtojvvOTZZBUxsx5EmsElP3rmMer3igPkw+sEkjphd qBEQ== X-Gm-Message-State: AOAM53021LHMAejr49/b84YZ8j+wCYtMJqw0o4Ii+Ho/bq8QaLViEqnC 9ieMK6PgimSjwTveP6dYHIY= X-Google-Smtp-Source: ABdhPJwSuPzquu8kUAxNyiwAm9/xkpxEyLKBIK+2FStPtDiTfsFEn7Q5tANPnti58aaRIauri31amA== X-Received: by 2002:a17:906:52c7:b0:6ce:a880:50a3 with SMTP id w7-20020a17090652c700b006cea88050a3mr1728945ejn.437.1649933032340; Thu, 14 Apr 2022 03:43:52 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id h9-20020aa7c949000000b0041b4d8ae50csm821318edt.34.2022.04.14.03.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 03:43:51 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube Subject: [PATCH v2 7/8] staging: r8188eu: check firmware header existence before access Date: Thu, 14 Apr 2022 12:43:22 +0200 Message-Id: <20220414104323.6152-8-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414104323.6152-1-straube.linux@gmail.com> References: <20220414104323.6152-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" We should access the fields of fwhdr only if the check for firmware header existence is true. Move the affected code into the if block that checks firmware header existence. Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index 64963507a346..c58bce1a1856 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -249,14 +249,13 @@ int rtl8188e_firmware_download(struct adapter *padapt= er) fw_data =3D dvobj->firmware.data; fw_size =3D dvobj->firmware.size; =20 - /* To Check Fw header. Added by tynli. 2009.12.04. */ fwhdr =3D (struct rt_firmware_hdr *)dvobj->firmware.data; =20 - pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", - DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, - le16_to_cpu(fwhdr->signature)); - if (IS_FW_HEADER_EXIST(fwhdr)) { + pr_info("%sFirmware Version %d, SubVersion %d, Signature 0x%x\n", + DRIVER_PREFIX, le16_to_cpu(fwhdr->version), fwhdr->subversion, + le16_to_cpu(fwhdr->signature)); + fw_data =3D fw_data + sizeof(struct rt_firmware_hdr); fw_size =3D fw_size - sizeof(struct rt_firmware_hdr); } --=20 2.35.1 From nobody Thu Jun 18 20:03:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82717C433EF for ; Thu, 14 Apr 2022 10:44:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242424AbiDNKqp (ORCPT ); Thu, 14 Apr 2022 06:46:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242405AbiDNKqS (ORCPT ); Thu, 14 Apr 2022 06:46:18 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 808946EC77 for ; Thu, 14 Apr 2022 03:43:54 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id c6so5788093edn.8 for ; Thu, 14 Apr 2022 03:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W3gIVX2j+QmqthafxJMF0q4aG/MQAnfAXiq7/gIShys=; b=XovvZG/8sCJ8k9pCBYUJ+OHgqqdde5GmmeXkHwJihA7upLfxvh1jDTUiXVdTJdBEiM EJhO78fW/ewzLp554JAnUIaOjDb7usX0v7DyA77Sdret4zAliR1gVhqeQBFssBPuG2f1 cRxz+VtIBj3v2woVJfjYNwEVg1zBmCniR9fbfROajydNbZgo89jpvZATvTsRuUJBnC84 /TMCCVw8tb/zvMjBBjEdmVUA2LCRmxboea9G0iGDK65uIco0mDhdc8u0Bn30nItCgL2N BLcVgiC24zVGcpOiEkXQQMk3hlQMKOsJIN+VIvT/t+cr+hnICgy9MBClrfwgqlXk77qg XvRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W3gIVX2j+QmqthafxJMF0q4aG/MQAnfAXiq7/gIShys=; b=jQ02B5QHOLuYgvtCV9V7B9pHn6F+sLJhLt8RDDR7SUMyuDcTnGkvAEtxCn6ALKVDci dBpeOcDX2PCvqa8tj1Od5FFnoLg6bME9J4jBPrAeSGEZKtpX0RRC4oI3ydsPtjgjyICu 1fS779wFl/AWAlEErjU2sLvqXqG9oMI/w9Z0qCt6jqeM1quZLVqmP35gmoBZOx1TWx4p Bx3iNa3KXmrAR/C0rgoqUx2hYkd4Mobz+lVYmdrQCuoc8KPa+fYeI9KypOMl+K7gEbUg g78wHYGFIt0B+q2lket+uyZEm92efNJwFw7omDi69p8qmpGxBRfUFBsxTTtF/4sFKJyQ TBfw== X-Gm-Message-State: AOAM533OYS7nmAi6qkC7gJch0DXkFtMUadKeSg9P/IJQekoKruv9klRx jZKxlywcGao3twCbCItJ88I= X-Google-Smtp-Source: ABdhPJxVyX5PxwakbXcEFYaxnu2B2+HCic+kNvRI1uhHPcpT1aWcCf5Cp8CfvubY2cTb78IH6B5NCg== X-Received: by 2002:a05:6402:438d:b0:419:4550:d52b with SMTP id o13-20020a056402438d00b004194550d52bmr2219466edc.83.1649933033138; Thu, 14 Apr 2022 03:43:53 -0700 (PDT) Received: from localhost.localdomain (ip5f5abb6b.dynamic.kabel-deutschland.de. [95.90.187.107]) by smtp.gmail.com with ESMTPSA id h9-20020aa7c949000000b0041b4d8ae50csm821318edt.34.2022.04.14.03.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Apr 2022 03:43:52 -0700 (PDT) From: Michael Straube To: gregkh@linuxfoundation.org Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Straube , David Laight Subject: [PATCH v2 8/8] staging: r8188eu: check rt_firmware_hdr size at compile time Date: Thu, 14 Apr 2022 12:43:23 +0200 Message-Id: <20220414104323.6152-9-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220414104323.6152-1-straube.linux@gmail.com> References: <20220414104323.6152-1-straube.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Check the size of struct rt_firmware_hdr at compile time since we rely on the size to be 32 in rtl8188e_firmware_download(). Suggested-by: David Laight Signed-off-by: Michael Straube --- drivers/staging/r8188eu/core/rtw_fw.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188e= u/core/rtw_fw.c index c58bce1a1856..4417375a158d 100644 --- a/drivers/staging/r8188eu/core/rtw_fw.c +++ b/drivers/staging/r8188eu/core/rtw_fw.c @@ -34,6 +34,8 @@ struct rt_firmware_hdr { __le32 rsvd5; }; =20 +static_assert(sizeof(struct rt_firmware_hdr) =3D=3D 32); + static void fw_download_enable(struct adapter *padapter, bool enable) { u8 tmp; --=20 2.35.1