From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) (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 3A60D3215 for ; Fri, 15 Apr 2022 12:10:40 +0000 (UTC) Received: by mail-ed1-f47.google.com with SMTP id c6so9705981edn.8 for ; Fri, 15 Apr 2022 05:10:40 -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=AIzdnXqq8wGLmGwxNERvkoiK7wlULE8JtNhbbdlQcXU=; b=AhZkde2UDiS6UAXvRn0HZ6uJDRpn0vfl8QQd12Hfwe7oU9pGBHHce640fZjHAMRORy 9KOrxP0tjpZTzpw+0d3JlaFy/jI/1GSXxztGSGUFivq3dlP0oS60vxeI5TaKRL8TrOmY 4j3+fKRNWTFy+0h/44cxsg/FbQ8QoKkTSsVoLyBiDZBAvF3BOqsMyQ4t9Dtr5Ohpuxd1 Sm3wrar3z/aOrBSz3QV3BQczvUVQTh8jfi6M2hPbT8vUZ0ix3e0/YUlcZjMpWTJz7QYK xUAlEGpjc946/wF9mxly3nSoDh1qSPTukAMHJU8lsdZrbEWcEYsN4drC6BB0I7R7DXBl Glzw== 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=AIzdnXqq8wGLmGwxNERvkoiK7wlULE8JtNhbbdlQcXU=; b=E2LLmORGIsgBJnThjCZl9Wp2TnXnPwpc86G8AepU8ljOsC870VtTm5OjJE+eHjmHMl SH6P4MQyHNftbQfy2aYwFkYoWYNK8hkOQzQOfMsXWlU6zVSSadlYPGkUnbdFoVK4F85C fhJv87c7uq7a/2KqZ/RvT9Pr4AS3WqsVxYpYzLu5z6RVrpMXiaH2R1KMsl8qoHM0b5Qg 3X4XzWXweYPA6NHVO67UvWtLEykOEDxxfnEbtHXuJWVgC4v1W30gnBVVjZ7w0b8bd1tn Jzas9eMufoYRFJok+BvblCx5w3zxBh2f13V8aNoRL0hrBMWqjdV7vC+49iS09t9cZCMm Br8g== X-Gm-Message-State: AOAM530O9ILqGg/KJXHAJMOfWTMHXVcy7mmUw/PdVO2YqM/+CMoenFv5 lURqq0CMu7M2PI/38pCfNDY= X-Google-Smtp-Source: ABdhPJxBzgAc60hojY9aRNWWERHCOl6M0oNxLqNlqslWmJlPsWaCWeT+juQcpPcQkopMEWbEz0enDw== X-Received: by 2002:a05:6402:ea8:b0:41d:78ca:b929 with SMTP id h40-20020a0564020ea800b0041d78cab929mr7906887eda.289.1650024638617; Fri, 15 Apr 2022 05:10:38 -0700 (PDT) Received: from localhost.localdomain (ip5f5abba5.dynamic.kabel-deutschland.de. [95.90.187.165]) by smtp.gmail.com with ESMTPSA id z22-20020a1709063ad600b006e8867caa5dsm1626114ejd.72.2022.04.15.05.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Apr 2022 05:10:38 -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 v3 5/8] staging: r8188eu: use sizeof instead of hardcoded firmware header size Date: Fri, 15 Apr 2022 14:10:20 +0200 Message-Id: <20220415121023.11564-6-straube.linux@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220415121023.11564-1-straube.linux@gmail.com> References: <20220415121023.11564-1-straube.linux@gmail.com> Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use sizeof() instead of hardcoding the firmware header size and add a compile time check to ensure struct rt_firmware_hdr has the correct size. Signed-off-by: Michael Straube --- v3: - added the compile time size check from patch 8/8 of v2 v2: - no changes drivers/staging/r8188eu/core/rtw_fw.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188eu/core/rtw_fw.c index 3da52a1ba23c..0279af37719a 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; }; +static_assert(sizeof(struct rt_firmware_hdr) == 32); + static void fw_download_enable(struct adapter *padapter, bool enable) { u8 tmp; @@ -263,9 +265,8 @@ int rtl8188e_firmware_download(struct adapter *padapter) DRIVER_PREFIX, fw_version, fw_subversion, fw_signature); if (IS_FW_HEADER_EXIST(fwhdr)) { - /* Shift 32 bytes for FW header */ - fw_data = fw_data + 32; - fw_size = fw_size - 32; + fw_data = fw_data + sizeof(struct rt_firmware_hdr); + fw_size = fw_size - sizeof(struct rt_firmware_hdr); } /* Suggested by Filen. If 8051 is running in RAM code, driver should inform Fw to reset by itself, */ -- 2.35.1