From patchwork Tue Jul 14 18:44:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 235547 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp3997322ilg; Tue, 14 Jul 2020 12:04:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwV7JofJcl0erE2PBDdqLcqrfAbScI74yjNoYq+HvqmRHcfuLLd0BQL8uUPKCvfCssqwpYp X-Received: by 2002:a50:cd1e:: with SMTP id z30mr5785899edi.364.1594753443632; Tue, 14 Jul 2020 12:04:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753443; cv=none; d=google.com; s=arc-20160816; b=OE88EL77S8kg0gtOvuA+lOGkMVSXr6D/GFHSgtgnuDoziUC33yP5vGLGR9O64B/pC8 a7hSX+yJtBjp7tOg5KZ912yGFrNdyokNI1KK4esffLN1XBM3m3wJlaaMNqPL2G8l9Kw3 O4e6ipfBGCiQsfuC9cFJ/3dsI6O/WikK9udhfeBViPpc0pFwGoN8tgMqTTC0r7KbWie6 uBbnU6947insKQsafb9GzsMucjEqY25LEomWJy8Pg/TCpQsEm5pzzzzbUCXkKUxugbU6 GkUDIn44h7iEPT6w49tcUXgVXrx+LZN0bGdKMXd+ny+rqgc+HojLMqumOr3eGhX+syKy yohw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o5YoUmF+2HTSFbFIMzWG5/tecrbx+zzCPNHiktjd92Y=; b=D4YVzdx3ebYfKjI9LznfkMT3cmgIZ7dTZIcMcYcpGf7EcfpLG5XKT1F8Ju6L/dFlQu +wTABaHATdX+dPAP0UhvLKIUsgddkuFImUyrPwUUWfOrfC2xIzMUsM0YHiOZtF07fzbb G1umL2tPZoqVNsqRI7QPmWBvCG8O40FNucuI568TaJwzDUelRbfjZ7VlCIf6qf04XIGF jXYu9Chl5Nef47nT8JysLpMjTKRECUWvF0StTN1UpGb2YQSV7NP1hIcpqPiZ+hFPk3NU aAsrrpWCxs6GXCkRfLJFYpHzWKkmC/dh0Lq7/68nTnozCdZEOhZ96T84oVv54W+T0TS5 qUJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jPhT6Jto; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id qq26si11160360ejb.675.2020.07.14.12.04.03; Tue, 14 Jul 2020 12:04:03 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jPhT6Jto; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729627AbgGNTD6 (ORCPT + 15 others); Tue, 14 Jul 2020 15:03:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:54856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731023AbgGNS4n (ORCPT ); Tue, 14 Jul 2020 14:56:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DC317229CA; Tue, 14 Jul 2020 18:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753003; bh=qlLNvsE77hLkylIVZ+jK60slbvjQdGxm1kMv+RPlm5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jPhT6JtopkOus+Ac6NAcjmC1RX1nmNAlG4ArKduCC9jfWsPrQGPkpTP22ZWp5mTCz SYDnxOQnIS/NbG+4w5JRJSfqwn22DIiL10towI7804ZN6LIgfugP4ska06TK4vTikP CgHNaJwIeDHJQYispopeGDUF/P8I5iuY8rcozLIQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alex Elder , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 082/166] net: ipa: fix QMI structure definition bugs Date: Tue, 14 Jul 2020 20:44:07 +0200 Message-Id: <20200714184119.779061934@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Alex Elder [ Upstream commit 74478ea4ded519db35cb1f059948b1e713bb4abf ] Building with "W=1" did exactly what it was supposed to do, namely point out some suspicious-looking code to be verified not to contain bugs. Some QMI message structures defined in "ipa_qmi_msg.c" contained some bad field names (duplicating the "elem_size" field instead of defining the "offset" field), almost certainly due to copy/paste errors that weren't obvious in a scan of the code. Fix these bugs. Fixes: 530f9216a953 ("soc: qcom: ipa: AP/modem communications") Signed-off-by: Alex Elder Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ipa/ipa_qmi_msg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.25.1 diff --git a/drivers/net/ipa/ipa_qmi_msg.c b/drivers/net/ipa/ipa_qmi_msg.c index 03a1d0e559644..73413371e3d3e 100644 --- a/drivers/net/ipa/ipa_qmi_msg.c +++ b/drivers/net/ipa/ipa_qmi_msg.c @@ -119,7 +119,7 @@ struct qmi_elem_info ipa_driver_init_complete_rsp_ei[] = { sizeof_field(struct ipa_driver_init_complete_rsp, rsp), .tlv_type = 0x02, - .elem_size = offsetof(struct ipa_driver_init_complete_rsp, + .offset = offsetof(struct ipa_driver_init_complete_rsp, rsp), .ei_array = qmi_response_type_v01_ei, }, @@ -137,7 +137,7 @@ struct qmi_elem_info ipa_init_complete_ind_ei[] = { sizeof_field(struct ipa_init_complete_ind, status), .tlv_type = 0x02, - .elem_size = offsetof(struct ipa_init_complete_ind, + .offset = offsetof(struct ipa_init_complete_ind, status), .ei_array = qmi_response_type_v01_ei, }, @@ -218,7 +218,7 @@ struct qmi_elem_info ipa_init_modem_driver_req_ei[] = { sizeof_field(struct ipa_init_modem_driver_req, platform_type_valid), .tlv_type = 0x10, - .elem_size = offsetof(struct ipa_init_modem_driver_req, + .offset = offsetof(struct ipa_init_modem_driver_req, platform_type_valid), }, {