public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Michael Straube <straube.linux@gmail.com>
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 <straube.linux@gmail.com>
Subject: [PATCH 7/7] staging: r8188eu: check firmware header existence before access
Date: Thu, 14 Apr 2022 10:38:53 +0200	[thread overview]
Message-ID: <20220414083853.3422-8-straube.linux@gmail.com> (raw)
In-Reply-To: <20220414083853.3422-1-straube.linux@gmail.com>

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 <straube.linux@gmail.com>
---
Do we need the IS_FW_HEADER_EXIST(fwhdr) check at all?
The header _does_ exist in rtl8188eufw.bin and it's very
unlikely that it ever changes _and_ the header will be
removed.

 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/r8188eu/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 *padapter)
 	fw_data = dvobj->firmware.data;
 	fw_size = dvobj->firmware.size;
 
-	/*  To Check Fw header. Added by tynli. 2009.12.04. */
 	fwhdr = (struct rt_firmware_hdr *)dvobj->firmware.data;
 
-	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 = fw_data + sizeof(struct rt_firmware_hdr);
 		fw_size = fw_size - sizeof(struct rt_firmware_hdr);
 	}
-- 
2.35.1


  parent reply	other threads:[~2022-04-14  8:39 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-14  8:38 [PATCH 0/7] staging: r8188eu: fix and clean up some firmware code Michael Straube
2022-04-14  8:38 ` [PATCH 1/7] staging: r8188eu: fix struct rt_firmware_hdr Michael Straube
2022-04-14 15:32   ` Larry Finger
2022-04-14  8:38 ` [PATCH 2/7] staging: r8188eu: clean up comments in " Michael Straube
2022-04-14  8:38 ` [PATCH 3/7] staging: r8188eu: rename fields of " Michael Straube
2022-04-14  8:38 ` [PATCH 4/7] staging: r8188eu: use sizeof instead of hardcoded firmware header size Michael Straube
2022-04-14 19:36   ` Pavel Skripkin
2022-04-14  8:38 ` [PATCH 5/7] staging: r8188eu: remove variables from rtl8188e_firmware_download() Michael Straube
2022-04-14  8:38 ` [PATCH 6/7] staging: r8188eu: always log firmware info Michael Straube
2022-04-14 15:36   ` Larry Finger
2022-04-14 19:39     ` Pavel Skripkin
2022-04-14  8:38 ` Michael Straube [this message]
2022-04-14 15:40   ` [PATCH 7/7] staging: r8188eu: check firmware header existence before access Larry Finger
2022-04-14 15:43 ` [PATCH 0/7] staging: r8188eu: fix and clean up some firmware code Larry Finger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220414083853.3422-8-straube.linux@gmail.com \
    --to=straube.linux@gmail.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    --cc=phil@philpotter.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox