From patchwork Tue Aug 8 15:38:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Markus_Bl=C3=B6chl?= X-Patchwork-Id: 13346170 X-Patchwork-Delegate: miriam.rachel.korenblit@intel.com 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 C37C9C001DB for ; Tue, 8 Aug 2023 15:50:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230175AbjHHPuY (ORCPT ); Tue, 8 Aug 2023 11:50:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229480AbjHHPsf (ORCPT ); Tue, 8 Aug 2023 11:48:35 -0400 Received: from DEU01-FR2-obe.outbound.protection.outlook.com (mail-fr2deu01on20602.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e24::602]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F5E84693; Tue, 8 Aug 2023 08:41:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WtYu1YG1xzlW+u6tXeVQYB+PJVIxwR5fxR5b9m7/Jcx7hLWyN4cG/5BxSqYxOUKAz6j3hhvr0Ff28BskTmMAE2zD57WtUXynV+zYveFqomjq7R4/9MRCxREogJZLpCCTOPBsWyNBPere6baf31q+Y4JaXmeZHJXcJGqsspVTtj0jzeSGaU6IDsuqaeasBAJZLvrWTF5IRmDK2bU6iMtHHGm0soG3+kOkg8oB1LXykOZnKViqERTY9Zkb7aRaMRxD6MeqplzDNPNQq6+QY459XMxa76WVEQPGiBkERQo19lI+XIAzkLlcCKS26t0IgiKrnPMqXeasdvQh7D3gC7nMqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=boCy9SNgLaOWTFDQH/NLa8Tfd0p2terCm6WZR+i1ebw=; b=LBWty0jZQ3Kc8pTz8AWo2Kgbi4ag9hFuGeioGdH+QTAamfXCD6HFVlwphAAyxxdtEp5OFuq0DUB40lMZiZygyAUJF+ZAk5RWLcc+smAAP7pFZXnOJDNHEgUr8NuJtJdcldAb3rIdWXVyqUnf1wlcfKv4n3OEnzJY2WNKoEhnkU90V7bZf8XjyS7b/rs/wMEF9HroaSUiD8OOdEcfbDFJwio1E9SPXUOCMwSAQSydwrUV+6PpI1Kw1Gfhf1HPQgORaxfHISQ7Di4HbPjhfL2q25ICjlsZBUzQISCeV/XTzCLoAzgaIUnXdsM0k1FOvTolrP0WOaMJdIxViCcfFOVzIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=ipetronik.com; dmarc=pass action=none header.from=ipetronik.com; dkim=pass header.d=ipetronik.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipetronik.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=boCy9SNgLaOWTFDQH/NLa8Tfd0p2terCm6WZR+i1ebw=; b=PmZA4WKsc+uRPSLJKbaiWQO7wVbYBsbAvCPwdmN7ws7ZQe504u3vjtKdXIow6sE/KQA7TTj3ekQMlNq07rxAtZFjbmCPWg39zhRdXJDtBXZxMxuqt9gNNIOoE/X5NutkmYOBIt8QL83T001CWnX8xd+/XJQFbeUweyc28yr4yiNLoANBeWroonjCx8Lfb3pcT66z0YqqZW6QdC+wMvLw24Zmh9EaLUU49OWb0pao2vHyLCXfBsfydYfNAObh4lacHx/VFW2sgsoh6QsPfd8O26BveK3M3Uwr0S2S3ExhLHs30uoYVp0VRGhv+PaCP0PGYqVO2GdWedVxzXz8p72chA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=ipetronik.com; Received: from BEZP281MB3205.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:28::12) by BEZP281MB1976.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:5b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 15:38:48 +0000 Received: from BEZP281MB3205.DEUP281.PROD.OUTLOOK.COM ([fe80::f4f6:cb64:e0c4:ab]) by BEZP281MB3205.DEUP281.PROD.OUTLOOK.COM ([fe80::f4f6:cb64:e0c4:ab%2]) with mapi id 15.20.6652.026; Tue, 8 Aug 2023 15:38:48 +0000 Date: Tue, 8 Aug 2023 17:38:45 +0200 From: Markus =?utf-8?q?Bl=C3=B6chl?= To: Gregory Greenman , Luciano Coelho , Johannes Berg Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] wifi: iwlwifi: xvt: fix tx_req.data not being the last member of iwl_xvt_tx_mod_task_data Message-ID: Content-Disposition: inline X-ClientProxiedBy: AS4P250CA0019.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:5e3::10) To BEZP281MB3205.DEUP281.PROD.OUTLOOK.COM (2603:10a6:b10:28::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BEZP281MB3205:EE_|BEZP281MB1976:EE_ X-MS-Office365-Filtering-Correlation-Id: e2ee5e6d-e22a-4577-98f2-08db98258eac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q1EwLhHwwEgEkuphyPw+T7HYhJvPCX67N9WrX3FauVLwidZQNiKNy9kFtUKYaV+M4qSAbJuvbKfpK8H1r/h3eNOKsgno9HFAx+FAT2nMUbMTaeMyiSzGy36MshxqCIQNQVitQz95eSzAU775IAJV2jHxPLJtCF8wo0CBzD+oFS9lP1c0vPdn1m4osUpasoJrGgVdVrK1dmNtKRPdPjcRxT3vF+hKrVFR/rK77fY1pKK350KKVC+uqr7nywbzQnxz1g80gUs4DzTrll3IVC5beK3tAnSDq+zcJBIREQXIvhRXWZ1Iaz3wW2kPly/wtf9CAwoCIYvUrGEp8yHS4RfnxOIo2AQbOgLIcYQ47Bl+Fsm1uwFnFCtEe2Z5vHyB+Fl1L12sM2xXXc3jg6ZC8XD/cnGlssYZrFDXD2YIEvT4UE5cgcqhsHBGgcA4mMFH7+lNy3+nfAuVP8Oe0enNpIa6aO/VjD+XhgktyyXROqBV9Z+TPTES0gtE1unNdtPREFBtAHeUurviWTTLiKMAfHbygx3MK75AnlLRdytRFUB6A7T9tcowllSUm1XqyIG6WjOiI28lZ6qvDfhqEp1Dvubp7wu7ju2XvSd2tlzaGvXdPiFKEXgr4aB/U+14WF7BbrMSDNe7aFXGqNcnbhTmlsYYFTJ2Ab8ehF+8ZYdQoKk0lI0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BEZP281MB3205.DEUP281.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(7916004)(396003)(376002)(366004)(136003)(39850400004)(346002)(1800799003)(451199021)(186006)(2906002)(26005)(33716001)(38100700002)(66574015)(6506007)(8676002)(5660300002)(8936002)(83380400001)(66946007)(41300700001)(66556008)(66476007)(316002)(6512007)(86362001)(9686003)(6666004)(4326008)(110136005)(478600001)(6486002)(12101799016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?0SO94M74wYS1heEJso5bj62cxrIP?= =?utf-8?q?VBaNlbSQrncv0ShBCJUsoDoRfMW3uOIeXirEXfiOvA2aCl+JuFfFcYZ2+uc1fa+t/?= =?utf-8?q?w5L7ywnJZ6tKzmuKY8Q9z3wkIVuwatvKUF5gpQwr6kt7Uiq+fb6oue9zxbM4UgMBw?= =?utf-8?q?eVQu0u73OsfLsYWZ+nzA13SwIbDPXAtwatw6H8PZMjCtXVX0r+DW4F0a58jvQSk1v?= =?utf-8?q?jOeqWooe4w5RrbcXBPA4QErpgrhMyl3FfetzEt60PYepcwXx6BJSZk5zLng60X++X?= =?utf-8?q?n72FXPKOjdIpfBwbs/XtyGwb0u9NSUxVx80lOlfV0FEhDzKWHMdgF2OXM8K14bvNX?= =?utf-8?q?owe6eY2qMFc3eZhUUMCTJ3A7w98yMx25LnlJHr297HEJktmdyxGURsPYwamIZOLZY?= =?utf-8?q?PZz7Nr2J97AM+4CLxSlm8lOqU6yHbRlPvXkbAWytTyfXAELqioR/pSWruvGJ7Nwv2?= =?utf-8?q?lL741dwYFKfqz0PAdwr0j/1pbA11uLHY4/gmvn++bh8L5CK+NPRWHfkWIC6UYUv2B?= =?utf-8?q?9rom1rwXMWYDr9Xt1CpkrINocJAyWfYSNprQiXhaRZdsvxSjW+inhwa8FgNdWCaZb?= =?utf-8?q?2SHM4nvhghNT2n/wwAkFdisSOOHnpfhtb16NeV8zlko0NJqkNuk++f9EpmzjBvUGl?= =?utf-8?q?tKcB88gKOLm/2JwzsrJUQQRcMTIHAuh410iFDN7uJQYINN53oKuklCK9ix4Lzx/14?= =?utf-8?q?4uzlTIQ8AsiFJnFMtg5u2qGaJ3sptTyLM6oCjtb5wXAQHwo9myHAOVlRGXtVAnGpS?= =?utf-8?q?6O4bGH+5rI59EpmANI2THZhnSlQvW/k34HuJZryAUNlU7fo/mfmgeG406oLT+TO8e?= =?utf-8?q?jMd7PEOZtg1f+72Te+/sIfxiBS6iWwwOzzwiInc/yVlcMC7MYxTQ8ELlP3rKP6bZ5?= =?utf-8?q?97Ifwhxhzd1tXZU/sLDnklNqFXEad+lRskN2IK0jCqpcFQJJbDj7/7A0IqXu2Tt50?= =?utf-8?q?MWTYX3QS6DkZW/Hx4vA3NC+q4oGCpUziBTisPZ4PkdMOHCPvHvpwBWs2D5G9trk9D?= =?utf-8?q?cfzOXak6Eg2bW0sFN5Bw/ybshh/Lku2p2nr7QfopPtL5S6/4H8kVF04l4lsiThG4o?= =?utf-8?q?Em6AM//Fhlvx8+B4jum1wx059K/De3dff6A3z4u8pIo+KXbnYQZT4TZgraROxiPRn?= =?utf-8?q?3HXabHIl6CTeaiAJzEWYHtjAUgQocFbnR65fA3SaEw3q+Odw05F8Xuamw600KsOqU?= =?utf-8?q?I7+DpKMfultDHQ1PDawkjbJhEMbGFO34I6N3HvrROSuJ8I69f8GwbVsEWiHGBmcdP?= =?utf-8?q?a0UfewkMX+77qr628ufUG5gBDJrg0Fhmj1hfj6qMTMVmoNjjojPnTkmndwkbRv456?= =?utf-8?q?xiq+3nIJSKOJaKtMeyj4Pai5LhqLBWfz7T8naWTs8IpUfwsRWMukoINvhIG4OgZ34?= =?utf-8?q?rji9VW/PLDvSPHjFHzlunuSTEu4U1/gZE6F1WT7Gi6lkLCkOhlDlX6YeqXtACFU1l?= =?utf-8?q?2Z/+pHb3ZhKcC4z6npCQKs+0s/SsOpFjiu5A7Rj8xf7QLQYZ8sqUljSOg2TwIZEWM?= =?utf-8?q?baOga3KouKeSslx4nkyEbqPC4tUtmdMSuQ=3D=3D?= X-OriginatorOrg: ipetronik.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2ee5e6d-e22a-4577-98f2-08db98258eac X-MS-Exchange-CrossTenant-AuthSource: BEZP281MB3205.DEUP281.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 15:38:47.9480 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 982fe058-7d80-4936-bdfa-9bed4f9ae127 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ikAp1yVc1OHYOd+PsWXYhlmTJWz5W4upwZerk4idyMfiCChihVfZcpvlph3bIS5ucMgkoB3O8+Svv0VRSxgbI+glBudKX6aBOA4Jt26Jsm4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BEZP281MB1976 Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This patch is for backport-iwlwifi only. There is a violation of the "encapsulating flexible array struct" rule. As struct iwl_tm_mod_tx_request contains the flexible array member 'data' it also needs to be the last member of struct iwl_xvt_tx_mod_task_data. Otherwise the flexible array is no longer at the end of struct iwl_xvt_tx_mod_task_data but instead overlaps with iwl_xvt_tx_mod_task_data::completion. Fixes: 3316d819dc59 ("[NOUPSTREAM] iwlwifi: xvt: fix thread completion") Signed-off-by: Markus Blöchl --- drivers/net/wireless/intel/iwlwifi/iwl-tm-infc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 7a0a4e45dd7b1482c9964748d0ffb086552a9d1e diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-tm-infc.h b/drivers/net/wireless/intel/iwlwifi/iwl-tm-infc.h index fa647339ff93..68b44662cd78 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-tm-infc.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-tm-infc.h @@ -459,8 +459,8 @@ struct iwl_tm_mod_tx_request { struct iwl_xvt_tx_mod_task_data { __u32 lmac_id; struct iwl_xvt *xvt; - struct iwl_tm_mod_tx_request tx_req; struct completion *completion; + struct iwl_tm_mod_tx_request tx_req; } __packed __aligned(4); /*