From patchwork Thu Jun 29 14:18:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 26661 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 098E5EB64D9 for ; Thu, 29 Jun 2023 14:19:06 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.9566.1688048343641679509 for ; Thu, 29 Jun 2023 07:19:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=X3ydiAkO; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=6544a6758f=ovidiu.panait@windriver.com) Received: from pps.filterd (m0250809.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 35TCS1Zl004293 for ; Thu, 29 Jun 2023 07:19:03 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= PPS06212021; bh=1p1Zltg78op8P6rxfeB5CJlUtwJOWpSg48JOI2HiHws=; b= X3ydiAkOsPaeIvUyHYS/TavWrJcXmD/y5lQAvUi5Wmb+LZQCyQk0+YSghPbYsiFr 9F9tZPIZpsj8VshRL/Ev6E7jDcHs56baouMb0lScpjDBFw0fn7+I9FrZTWfmBUss eiZcnZ2TMuItBuKz/la1rJBRCSA5WJUBFCdsCF60LOJkHLdULk8f5Ccp1GqACmNi Eznru5iutLckxJBoUhbPTTr2MrJMqZzMtMh8GbeO9qnv/KTQ9LGvdAtFoXbAVRpx PGAYiTRWmSshRDqWhZQb+/PGLLa5sxlRLhXazkYOkXmlk9n73CQiBBMBgw9PlkmF xYXGWMBlvJwNoRa4AE5w0g== Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2043.outbound.protection.outlook.com [104.47.57.43]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3regfb44ef-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 29 Jun 2023 07:19:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E98E2L7Tsqtyw542Wokeq7aJY8TFX0kECSXc/W4ssyNLRMP8NIj9FjeLBo8uU1VQMSuYQQbikodlIKf5EpSoq9LE3s7I6EqUHi6HvT6o/Pd/RvDLfMJyaXDbMOSxqK/eyJZchd5DaGZUfYzo1SxUnRMaFYbHsTop+38CJbxeEq/4wkIQW5XpNGqoTciLZmSgzhNAIDwJR0fMIdXja8NEQp5hOGUDaeEwJswG18HLbJ6djVl3BoaamPKfElEXythU/LBa7xT4NKcSLqh95WoDqrOGHoBn2m/eKvzulfFHIRLyfclv8gdNdx7EfnslbDhK/8RDdbG556FmBgHWuZ1kOA== 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=1p1Zltg78op8P6rxfeB5CJlUtwJOWpSg48JOI2HiHws=; b=bC3mEKnq7P6qGK0Q4hh1D/7s0d6aq2vUjXz+2oYlp4M5Hohivpt3mJlaQdy7i6oEmQdpwqlUz+Va0NMHsDDZEkxIxQU3ASjRkIFRnPtIyPkbhKpgLgNBDtaqU321p0TgR+ER7+DX8dD52nI4Z+UZAMz+dl3RSI025OYdBfeZhmIHxROrI4kBgQ0rCWG2S+6duMAOvm/AnyEoaleD/SmxOZuzu2HKVGA2/A20mGeczfH2y4AfjbigwrizY9fUMi9y7VolUnlecsH4IF2Rx+GAnznCAegeF0c4PFJpmyJiRV4j4yWnnK1qDl4avqr9aWAJvst9uSFOAXQosF/rQOeGdg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) by DS0PR11MB7442.namprd11.prod.outlook.com (2603:10b6:8:14d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Thu, 29 Jun 2023 14:18:58 +0000 Received: from DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::3686:e9c9:56d6:8949]) by DM4PR11MB5327.namprd11.prod.outlook.com ([fe80::3686:e9c9:56d6:8949%4]) with mapi id 15.20.6521.024; Thu, 29 Jun 2023 14:18:58 +0000 From: ovidiu.panait@windriver.com To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] mdadm: fix segfaults when running ptests Date: Thu, 29 Jun 2023 17:18:35 +0300 Message-Id: <20230629141836.3431391-3-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230629141836.3431391-1-ovidiu.panait@windriver.com> References: <20230629141836.3431391-1-ovidiu.panait@windriver.com> X-ClientProxiedBy: VE1PR03CA0041.eurprd03.prod.outlook.com (2603:10a6:803:118::30) To DM4PR11MB5327.namprd11.prod.outlook.com (2603:10b6:5:392::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM4PR11MB5327:EE_|DS0PR11MB7442:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e907b4e-89f8-47be-b522-08db78abc758 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: K4RpsCYtHArWvOJOLX13QUvTf8+S5Y6rXRk/rPWjy64RrT+VXak8HOWiBvDvuY46M7eSFqv7A8G5s4yCfBbfElCto0BHZ/2pHASesTmHCzFamshWnTiIZf5cjBh/wLRysmmyQGyPj899ygjK6HXRmNFsdFD0c0Zt+xBpvmckwJYC9mw1YCuofOIK5spQqOFZTqEfLTgczoIO/qc1JgI9Il9BGc99pLkxk/pLm9T7VLCPFoZbdjThPezSp4EctExxulicT02v49PdXQztRh9XO/4jJIfe3irCYP22BJIfxqsMea5zeOxcUKZW8iKXw5zUGIbVgSE9FbWSdEO7aUjbhXsAyki+BsOFwTddO834et3y6LaVx6WSyapWbE2YwZwyji279KVVMhvOyVwGpWxtHcdqaQfj6u+ZAwL6YO5n71qMK0RaAH7NKTxFk9u6KmGxbU6vvnBdRKPS89kUwF8wS2/q5PVIW9yDr4snXigGKeNp0FaMC+KfVmdmE/xc3jCi7jNhre3ySZvrhMLoGaZCLqWKUbqfUTmC7qVhDHHJp6v9WdayBUnhWhfl9zAo8H4FxlITsQXn2ziQA6SKazo/vyVmxjZFjw3X9we+P61rlXE= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR11MB5327.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(136003)(346002)(396003)(366004)(376002)(39850400004)(451199021)(186003)(2906002)(5660300002)(30864003)(26005)(316002)(36756003)(8676002)(6666004)(6486002)(6916009)(966005)(478600001)(86362001)(1076003)(38100700002)(38350700002)(66476007)(52116002)(83380400001)(66946007)(8936002)(41300700001)(66556008)(9686003)(2616005)(6506007)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wSyGMCjuGHaDE7mOxA3+tgXPtj4Cszel60EALbSrH5yIuuqc4O8c51zmLoENxhVScLd0x+ZwwETnaYq5xYUif2uvaNl+ZhzjBp20rEt3Oh0tQxK0BrgVBisXU7P/nUs11vo7KwURkymx0UGtlpLgOi2440VIATLEbZD05t5g8D+FVCNDQCwAX8sfFYcH5N+R3vCjU0UVRbSEhxie9hPA1HXSzlN++EWgR/mQ1jfPhbbmwVgGueRxdYNINe3ak2FIhJu1mZNhk1L7MqznWuPUGKwuLXGWyCXW1Zuzc4CONVXi7LfilYEydX8iqP3YZWiCWCIEdqMgO83fgqN9Mb86VhOpeVRjsBhZpfWG8cv1EnZMCAwop4uFlhkgfIAG34Ivx9tkOqN0kEZ2KhAfE5YwIP6tv2wg6oCWcE/4/moSqsCm3/NRgffur1KA4ajRlL10gBHRi+JqeN1ay6dR3t/d2+AbUYuW/qL6rWCH0b3gBG65/nTwwJjmg/i15Q2yZNEISqJXXT0FRh7x2bcRLJBji/2IzM+gFGG/w96tt2JksXh0jWTvrKMDdciqoMC9n8mKGmdNnsN5flP2Im1NeSVSSSSorWOeRYdVSLzmtBaz7I8re9dEskM9kHg8Z12EVwr0AsYoQATlWi9pc1UtRlWcrqXzKrZHjGbcNcduUFWHSxssz+9qj5v3Gu8Hyxqe8gXbWrV81ROf14Bmx+FVADrK19p1lOZq3QsNxwwEErwRioFnqlIuaBDxyICRcZ66GtkXt/tvna0ymAe2Ie1wDy1/ZB5mW+X/IdwTqeMHztL2rZMyXJ5xFszV9iiRpWmwitEOzTefliJLMcYxH8ovlIugoxFIsScdhid2R7tK5NAHvKMCMm4fBQSuac23Ez3WnKhJ0X2J9+CnWwmwpHwVkZJbhOKEoP+TgTXt4FKUC2yrwCmzVpbk1fWZmRXj6tGoOe3olv0R0oZzTSmts0ySB3X6s0t+acCRE3jZ/d6GAxp2VJxf6wBkevtJuL2pFtBywPNhMAHVHcjFUGORuCckwmHxIxDA6CSspe4b78oNiq8s88qoqcmoGTmQGHD7/EhGJ3ZgvSgrGKNK3RfDoyI8k9K1nH514fPDDNBkyXOV20c7Sc1g65XBk100FFpIHUpZ5oRCTr9UJqNjx75asrO5oywZguIfAHDitGE/hmGIJk3XObPqeFcRiONR7Wc+aNR8wRk1Ci3it4Zb0kTxxq4+ZKx+uJf9kjlBmjzF8Zhpck64jAMMb2jC3Zbi1b6HlnF1wSVz0G8sorRZQppSabP1eItKue9g7xyayh70zObTKG3b8v5BxiSK84NAyVsW7jbRaDlOhmaiwZMNWsyIcw3pPBGe31ygLrcuKwsEPRqKQhR1XBVoXpLomHOBp5/a0Gz6ZbdW774Kvyd3V4EmLB6t1sORftAVgf1eDKK+5oSTHhxxatZZlxSOEwS66FghZZ1ytEkr7VpVwMRhqWjF/OIYK134uIKhNZpOIDYw7XEP2BaukRsAXuexW5fA2F8UEUAX2kbUJgzt73Tezil6kDrDWhaTsf3J/WWgI9FuO3aPHBVXA8zWKUbdMVaqGalnydU6mOmtsAw2IiOpX/uF84VStzR+9Q== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1e907b4e-89f8-47be-b522-08db78abc758 X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5327.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 14:18:58.5005 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RxYIM+kY6q5tYsJch42o9IVdsgaZwty2UG8Alj86iL6NpGIobal1j3at+l7SEXOF0dG7hKK0gt5zFPJuebSZwJcInQsAJ8j25GbsdpSGbbQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB7442 X-Proofpoint-GUID: 92kETpz3t-wSLloz6UdtTFJmkwh4eew8 X-Proofpoint-ORIG-GUID: 92kETpz3t-wSLloz6UdtTFJmkwh4eew8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-29_03,2023-06-27_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 clxscore=1015 priorityscore=1501 lowpriorityscore=0 phishscore=0 bulkscore=0 impostorscore=0 mlxscore=0 suspectscore=0 malwarescore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2305260000 definitions=main-2306290128 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 29 Jun 2023 14:19:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/183633 From: Ovidiu Panait Currently, some segfaults are reported when running ptest: mdadm[12333]: segfault at 0 ip 00007fe855924060 sp 00007ffc4d6caf88 error 4 in libc.so.6[7f) Code: d2 0f 84 b7 0f 00 00 48 83 fa 01 0f 84 b9 0f 00 00 49 89 d3 89 f1 89 f8 48 83 e1 3f 4f Backport the following upstream commits to fix them: 679bd9508a30 ("DDF: Cleanup validate_geometry_ddf_container()") 2b93288a5650 ("DDF: Fix NULL pointer dereference in validate_geometry_ddf()") 548e9b916f86 ("mdadm/Grow: Fix use after close bug by closing after fork") 9ae62977b51d ("monitor: Avoid segfault when calling NULL get_bad_blocks") The fixes are part of the "Bug fixes and testing improvments" patchset [1]. [1] https://www.spinics.net/lists/raid/msg70621.html Signed-off-by: Ovidiu Panait --- ...anup-validate_geometry_ddf_container.patch | 148 ++++++++++++++++++ ...nter-dereference-in-validate_geometr.patch | 56 +++++++ ...se-after-close-bug-by-closing-after-.patch | 91 +++++++++++ ...gfault-when-calling-NULL-get_bad_blo.patch | 42 +++++ meta/recipes-extended/mdadm/mdadm_4.2.bb | 4 + 5 files changed, 341 insertions(+) create mode 100644 meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch create mode 100644 meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch create mode 100644 meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch create mode 100644 meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch diff --git a/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch b/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch new file mode 100644 index 0000000000..cea435f83b --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0001-DDF-Cleanup-validate_geometry_ddf_container.patch @@ -0,0 +1,148 @@ +From ca458f4dcc4de9403298f67543466ce4bbc8f8ae Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:07 -0600 +Subject: [PATCH 1/4] DDF: Cleanup validate_geometry_ddf_container() + +Move the function up so that the function declaration is not necessary +and remove the unused arguments to the function. + +No functional changes are intended but will help with a bug fix in the +next patch. + +Signed-off-by: Logan Gunthorpe +Acked-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=679bd9508a30 + +Signed-off-by: Ovidiu Panait +--- + super-ddf.c | 88 ++++++++++++++++++++++++----------------------------- + 1 file changed, 39 insertions(+), 49 deletions(-) + +diff --git a/super-ddf.c b/super-ddf.c +index 3f304cd..65cf727 100644 +--- a/super-ddf.c ++++ b/super-ddf.c +@@ -503,13 +503,6 @@ struct ddf_super { + static int load_super_ddf_all(struct supertype *st, int fd, + void **sbp, char *devname); + static int get_svd_state(const struct ddf_super *, const struct vcl *); +-static int +-validate_geometry_ddf_container(struct supertype *st, +- int level, int layout, int raiddisks, +- int chunk, unsigned long long size, +- unsigned long long data_offset, +- char *dev, unsigned long long *freesize, +- int verbose); + + static int validate_geometry_ddf_bvd(struct supertype *st, + int level, int layout, int raiddisks, +@@ -3322,6 +3315,42 @@ static int reserve_space(struct supertype *st, int raiddisks, + return 1; + } + ++static int ++validate_geometry_ddf_container(struct supertype *st, ++ int level, int raiddisks, ++ unsigned long long data_offset, ++ char *dev, unsigned long long *freesize, ++ int verbose) ++{ ++ int fd; ++ unsigned long long ldsize; ++ ++ if (level != LEVEL_CONTAINER) ++ return 0; ++ if (!dev) ++ return 1; ++ ++ fd = dev_open(dev, O_RDONLY|O_EXCL); ++ if (fd < 0) { ++ if (verbose) ++ pr_err("ddf: Cannot open %s: %s\n", ++ dev, strerror(errno)); ++ return 0; ++ } ++ if (!get_dev_size(fd, dev, &ldsize)) { ++ close(fd); ++ return 0; ++ } ++ close(fd); ++ if (freesize) { ++ *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS); ++ if (*freesize == 0) ++ return 0; ++ } ++ ++ return 1; ++} ++ + static int validate_geometry_ddf(struct supertype *st, + int level, int layout, int raiddisks, + int *chunk, unsigned long long size, +@@ -3347,11 +3376,9 @@ static int validate_geometry_ddf(struct supertype *st, + level = LEVEL_CONTAINER; + if (level == LEVEL_CONTAINER) { + /* Must be a fresh device to add to a container */ +- return validate_geometry_ddf_container(st, level, layout, +- raiddisks, *chunk, +- size, data_offset, dev, +- freesize, +- verbose); ++ return validate_geometry_ddf_container(st, level, raiddisks, ++ data_offset, dev, ++ freesize, verbose); + } + + if (!dev) { +@@ -3449,43 +3476,6 @@ static int validate_geometry_ddf(struct supertype *st, + return 1; + } + +-static int +-validate_geometry_ddf_container(struct supertype *st, +- int level, int layout, int raiddisks, +- int chunk, unsigned long long size, +- unsigned long long data_offset, +- char *dev, unsigned long long *freesize, +- int verbose) +-{ +- int fd; +- unsigned long long ldsize; +- +- if (level != LEVEL_CONTAINER) +- return 0; +- if (!dev) +- return 1; +- +- fd = dev_open(dev, O_RDONLY|O_EXCL); +- if (fd < 0) { +- if (verbose) +- pr_err("ddf: Cannot open %s: %s\n", +- dev, strerror(errno)); +- return 0; +- } +- if (!get_dev_size(fd, dev, &ldsize)) { +- close(fd); +- return 0; +- } +- close(fd); +- if (freesize) { +- *freesize = avail_size_ddf(st, ldsize >> 9, INVALID_SECTORS); +- if (*freesize == 0) +- return 0; +- } +- +- return 1; +-} +- + static int validate_geometry_ddf_bvd(struct supertype *st, + int level, int layout, int raiddisks, + int *chunk, unsigned long long size, +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch b/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch new file mode 100644 index 0000000000..fafe88b49c --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch @@ -0,0 +1,56 @@ +From 14f110f0286d38e29ef5e51d7f72e049c2f18323 Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:08 -0600 +Subject: [PATCH 2/4] DDF: Fix NULL pointer dereference in + validate_geometry_ddf() + +A relatively recent patch added a call to validate_geometry() in +Manage_add() that has level=LEVEL_CONTAINER and chunk=NULL. + +This causes some ddf tests to segfault which aborts the test suite. + +To fix this, avoid dereferencing chunk when the level is +LEVEL_CONTAINER or LEVEL_NONE. + +Fixes: 1f5d54a06df0 ("Manage: Call validate_geometry when adding drive to external container") +Signed-off-by: Logan Gunthorpe +Acked-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=2b93288a5650 + +Signed-off-by: Ovidiu Panait +--- + super-ddf.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/super-ddf.c b/super-ddf.c +index 65cf727..3ef1293 100644 +--- a/super-ddf.c ++++ b/super-ddf.c +@@ -3369,9 +3369,6 @@ static int validate_geometry_ddf(struct supertype *st, + * If given BVDs, we make an SVD, changing all the GUIDs in the process. + */ + +- if (*chunk == UnSet) +- *chunk = DEFAULT_CHUNK; +- + if (level == LEVEL_NONE) + level = LEVEL_CONTAINER; + if (level == LEVEL_CONTAINER) { +@@ -3381,6 +3378,9 @@ static int validate_geometry_ddf(struct supertype *st, + freesize, verbose); + } + ++ if (*chunk == UnSet) ++ *chunk = DEFAULT_CHUNK; ++ + if (!dev) { + mdu_array_info_t array = { + .level = level, +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch b/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch new file mode 100644 index 0000000000..a954ab027a --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch @@ -0,0 +1,91 @@ +From bd064da1469a6a07331b076a0294a8c6c3c38526 Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:09 -0600 +Subject: [PATCH 3/4] mdadm/Grow: Fix use after close bug by closing after fork + +The test 07reshape-grow fails most of the time. But it succeeds around +1 in 5 times. When it does succeed, it causes the tests to die because +mdadm has segfaulted. + +The segfault was caused by mdadm attempting to repoen a file +descriptor that was already closed. The backtrace of the segfault +was: + + #0 __strncmp_avx2 () at ../sysdeps/x86_64/multiarch/strcmp-avx2.S:101 + #1 0x000056146e31d44b in devnm2devid (devnm=0x0) at util.c:956 + #2 0x000056146e31dab4 in open_dev_flags (devnm=0x0, flags=0) + at util.c:1072 + #3 0x000056146e31db22 in open_dev (devnm=0x0) at util.c:1079 + #4 0x000056146e3202e8 in reopen_mddev (mdfd=4) at util.c:2244 + #5 0x000056146e329f36 in start_array (mdfd=4, + mddev=0x7ffc55342450 "/dev/md0", content=0x7ffc55342860, + st=0x56146fc78660, ident=0x7ffc55342f70, best=0x56146fc6f5d0, + bestcnt=10, chosen_drive=0, devices=0x56146fc706b0, okcnt=5, + sparecnt=0, rebuilding_cnt=0, journalcnt=0, c=0x7ffc55342e90, + clean=1, avail=0x56146fc78720 "\001\001\001\001\001", + start_partial_ok=0, err_ok=0, was_forced=0) + at Assemble.c:1206 + #6 0x000056146e32c36e in Assemble (st=0x56146fc78660, + mddev=0x7ffc55342450 "/dev/md0", ident=0x7ffc55342f70, + devlist=0x56146fc6e2d0, c=0x7ffc55342e90) + at Assemble.c:1914 + #7 0x000056146e312ac9 in main (argc=11, argv=0x7ffc55343238) + at mdadm.c:1510 + +The file descriptor was closed early in Grow_continue(). The noted commit +moved the close() call to close the fd above the fork which caused the +parent process to return with a closed fd. + +This meant reshape_array() and Grow_continue() would return in the parent +with the fd forked. The fd would eventually be passed to reopen_mddev() +which returned an unhandled NULL from fd2devnm() which would then be +dereferenced in devnm2devid. + +Fix this by moving the close() call below the fork. This appears to +fix the 07revert-grow test. While we're at it, switch to using +close_fd() to invalidate the file descriptor. + +Fixes: 77b72fa82813 ("mdadm/Grow: prevent md's fd from being occupied during delayed time") +Cc: Alex Wu +Cc: BingJing Chang +Cc: Danny Shih +Cc: ChangSyun Peng +Signed-off-by: Logan Gunthorpe +Acked-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=548e9b916f86 + +Signed-off-by: Ovidiu Panait +--- + Grow.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Grow.c b/Grow.c +index 9c6fc95..a8e4e83 100644 +--- a/Grow.c ++++ b/Grow.c +@@ -3501,7 +3501,6 @@ started: + return 0; + } + +- close(fd); + /* Now we just need to kick off the reshape and watch, while + * handling backups of the data... + * This is all done by a forked background process. +@@ -3522,6 +3521,9 @@ started: + break; + } + ++ /* Close unused file descriptor in the forked process */ ++ close_fd(&fd); ++ + /* If another array on the same devices is busy, the + * reshape will wait for them. This would mean that + * the first section that we suspend will stay suspended +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch b/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch new file mode 100644 index 0000000000..72cb40f782 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch @@ -0,0 +1,42 @@ +From 2296a4a441b4b8546e2eb32403930f1bb8f3ee4a Mon Sep 17 00:00:00 2001 +From: Logan Gunthorpe +Date: Wed, 22 Jun 2022 14:25:10 -0600 +Subject: [PATCH 4/4] monitor: Avoid segfault when calling NULL get_bad_blocks + +Not all struct superswitch implement a get_bad_blocks() function, +yet mdmon seems to call it without checking for NULL and thus +occasionally segfaults in the test 10ddf-geometry. + +Fix this by checking for NULL before calling it. + +Signed-off-by: Logan Gunthorpe +Acked-by: Mariusz Tkaczyk +Signed-off-by: Jes Sorensen + +Upstream-Status: Backport + +Reference to upstream patch: +https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=9ae62977b51d + +Signed-off-by: Ovidiu Panait +--- + monitor.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/monitor.c b/monitor.c +index afc3e50..8e43c0d 100644 +--- a/monitor.c ++++ b/monitor.c +@@ -312,6 +312,9 @@ static int check_for_cleared_bb(struct active_array *a, struct mdinfo *mdi) + struct md_bb *bb; + int i; + ++ if (!ss->get_bad_blocks) ++ return -1; ++ + /* + * Get a list of bad blocks for an array, then read list of + * acknowledged bad blocks from kernel and compare it against metadata +-- +2.39.1 + diff --git a/meta/recipes-extended/mdadm/mdadm_4.2.bb b/meta/recipes-extended/mdadm/mdadm_4.2.bb index a5844b6726..033766dc89 100644 --- a/meta/recipes-extended/mdadm/mdadm_4.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_4.2.bb @@ -32,6 +32,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://0001-tests-fix-raid0-tests-for-0.90-metadata.patch \ file://0001-tests-00readonly-Run-udevadm-settle-before-setting-r.patch \ file://0001-tests-04update-metadata-avoid-passing-chunk-size-to.patch \ + file://0001-DDF-Cleanup-validate_geometry_ddf_container.patch \ + file://0002-DDF-Fix-NULL-pointer-dereference-in-validate_geometr.patch \ + file://0003-mdadm-Grow-Fix-use-after-close-bug-by-closing-after-.patch \ + file://0004-monitor-Avoid-segfault-when-calling-NULL-get_bad_blo.patch \ " SRC_URI[sha256sum] = "461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d"