From patchwork Thu May 11 06:06:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1779781 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=MwzeauAO; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QH1cj672wz20fn for ; Thu, 11 May 2023 16:06:44 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pwzRn-0005gJ-Il; Thu, 11 May 2023 06:06:39 +0000 Received: from mail-pf1-f177.google.com ([209.85.210.177]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pwzRj-0005f8-L9 for kernel-team@lists.ubuntu.com; Thu, 11 May 2023 06:06:35 +0000 Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6438d95f447so5717687b3a.3 for ; Wed, 10 May 2023 23:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683785194; x=1686377194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=D/VPjLzRgnO8mXZxO2EimGAITjfuK8Mc6wFGhcyK4cQ=; b=MwzeauAOCf91aJNrIddFTwOcy8HM8enxp0h/WeeIDJ4BVaF/Bt9umLlfu4gNUhHmqk F5AQV2PtUVqVgNB6x1hthFiM17d0aNEcpWTVGgjo6JsctpToduWsCp5h2c4O3PTSGNPY fvKDpljYh2siPdx0VZ/PceqSKxOQWEuyAOq2fVvY87UMTMGa6laTjmhCPZ6C1yS6+PaD Ags+jMKizSjELkT5XczgUR97JVxeviR9zBKroXgX3+sJKQd7hfr9LadONJApQ+otXsd5 PQF/9iRN90dVl4renhb3k5MO7H9urKBo3KZUqULTAFX5mB4a9nV8UHPSQCvsfqPBNJvw lDRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683785194; x=1686377194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=D/VPjLzRgnO8mXZxO2EimGAITjfuK8Mc6wFGhcyK4cQ=; b=g+xR05OllgTaIhGj+4R6bWQA+e8uQyZgYaigjwBspQNNAbu0BfIEvbuFLNX+tChsd8 T9cEunb0N+rSnyRKr+ZKAtqjExvIvf6jWy8TL0U3suw915zZuzlnaCViPQNTU9UE35cY 2XbYl9xvbA2C1DlMO994Xg63/jJH9wgxgdFlurfdH4mbVSNiX64YzbfIjgGz4JMFDlZ4 BBUyK724IRdNxANDZC6RavXwhFLhGZxihk+AK2VWnJol8RVS/y+qF5NQJpPk007a7Nqu c8In9QLwSChs6i8iQ1l3/R3FJ3UxjRzsNskDLox3lC/8anaNUff0w3nK76bmBc7Hzdjm 3z0w== X-Gm-Message-State: AC+VfDxQpqXknUoOeuVJtFLQxlXZcAhWJneeBrCn2yKPV4bmbIw+Ej4r dD9xChOxvYTuZhEVPRqGcy8PTzdtBTFOjw== X-Google-Smtp-Source: ACHHUZ6i7sXfxCWb17Os/MwHNJJfkeQ5yJuoJdISlSF4aAkwY/iIxoIUZ2F/XNaWzD/OlYwNZYAUEw== X-Received: by 2002:a05:6a00:1787:b0:627:6328:79f1 with SMTP id s7-20020a056a00178700b00627632879f1mr30041210pfg.34.1683785193592; Wed, 10 May 2023 23:06:33 -0700 (PDT) Received: from localhost (220-135-95-34.hinet-ip.hinet.net. [220.135.95.34]) by smtp.gmail.com with ESMTPSA id i4-20020aa787c4000000b0063d2d9990ecsm4496183pfo.87.2023.05.10.23.06.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 May 2023 23:06:33 -0700 (PDT) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/6][SRU][K] scsi: megaraid_sas: Replace one-element array with flexible-array member in MR_FW_RAID_MAP Date: Thu, 11 May 2023 14:06:23 +0800 Message-Id: <20230511060628.48935-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230511060628.48935-1-acelan.kao@canonical.com> References: <20230511060628.48935-1-acelan.kao@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.210.177; envelope-from=acelan@gmail.com; helo=mail-pf1-f177.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: "Gustavo A. R. Silva" BugLink: https://launchpad.net/bugs/2008157 One-element arrays are deprecated, and we are replacing them with flexible array members instead. So, replace one-element array with flexible-array member in struct MR_DRV_RAID_MAP and refactor the the rest of the code accordingly. This helps with the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy(). Link: https://github.com/KSPP/linux/issues/79 Link: https://github.com/KSPP/linux/issues/109 Link: https://lore.kernel.org/r/4495ce170c8ef088a10f1abe0e7c227368f43242.1660592640.git.gustavoars@kernel.org Reviewed-by: Kees Cook Signed-off-by: Gustavo A. R. Silva Signed-off-by: Martin K. Petersen Enhanced-by: Kees Cook # Change in struct MR_FW_RAID_MAP_ALL (cherry picked from commit ac23b92b27e32f1ff331350342ce9f2ee9d0ab0f) Signed-off-by: Chia-Lin Kao (AceLan) --- drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- drivers/scsi/megaraid/megaraid_sas_fp.c | 2 +- drivers/scsi/megaraid/megaraid_sas_fusion.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 0917b05059b4..da3647682dfa 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -5159,7 +5159,7 @@ static void megasas_update_ext_vd_details(struct megasas_instance *instance) } else { fusion->old_map_sz = sizeof(struct MR_FW_RAID_MAP) + (sizeof(struct MR_LD_SPAN_MAP) * - (instance->fw_supported_vd_count - 1)); + instance->fw_supported_vd_count); fusion->new_map_sz = sizeof(struct MR_FW_RAID_MAP_EXT); fusion->max_map_sz = diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c index 83f69c33b01a..b2ec7a3f7650 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fp.c +++ b/drivers/scsi/megaraid/megaraid_sas_fp.c @@ -327,7 +327,7 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id) expected_size = sizeof(struct MR_FW_RAID_MAP_EXT); else expected_size = - (sizeof(struct MR_FW_RAID_MAP) - sizeof(struct MR_LD_SPAN_MAP) + + (sizeof(struct MR_FW_RAID_MAP) + (sizeof(struct MR_LD_SPAN_MAP) * le16_to_cpu(pDrvRaidMap->ldCount))); if (le32_to_cpu(pDrvRaidMap->totalSize) != expected_size) { diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.h b/drivers/scsi/megaraid/megaraid_sas_fusion.h index ce84f811e5e1..5530c233fccb 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.h +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.h @@ -942,7 +942,7 @@ struct MR_FW_RAID_MAP { u8 reserved2[7]; struct MR_ARRAY_INFO arMapInfo[MAX_RAIDMAP_ARRAYS]; struct MR_DEV_HANDLE_INFO devHndlInfo[MAX_RAIDMAP_PHYSICAL_DEVICES]; - struct MR_LD_SPAN_MAP ldSpanMap[1]; + struct MR_LD_SPAN_MAP ldSpanMap[]; }; struct IO_REQUEST_INFO { @@ -1148,7 +1148,7 @@ typedef struct LOG_BLOCK_SPAN_INFO { struct MR_FW_RAID_MAP_ALL { struct MR_FW_RAID_MAP raidMap; - struct MR_LD_SPAN_MAP ldSpanMap[MAX_LOGICAL_DRIVES - 1]; + struct MR_LD_SPAN_MAP ldSpanMap[MAX_LOGICAL_DRIVES]; } __attribute__ ((packed)); struct MR_DRV_RAID_MAP {