Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp5559475pxb; Mon, 28 Mar 2022 14:13:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcDy63QMmLIgXZNH2B1tu/TMSbI/v3OFpqeZNesF6N4KcOc9+eCqnQKU7svGblwob3QbIu X-Received: by 2002:a63:b910:0:b0:398:31d6:db12 with SMTP id z16-20020a63b910000000b0039831d6db12mr8306241pge.452.1648501985563; Mon, 28 Mar 2022 14:13:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648501985; cv=none; d=google.com; s=arc-20160816; b=eCugHask3FXqLr5IT1ZPVw5PKKZxDY49hMgixG7nXk92EWK/RYFBRuimi+5tJJDiXg 294wIcAKtCztTa1mz9fLBh/yIN1xm9xsIkDQtDp/xGIrF3e1uYNtGGbE6QhCPhCEyXQ1 F8K8KbGKnDKDpdrrCMyk4odlJxXxmLE7rTK3urcZ6td/KFZ/U2dh6datpVlq7eMp1Xfm jwM/Y/zLR+D+SKq/8cCaTyfg1BhuYbrBlvMQwN4m251mPQUAycLtafqMO4rwHO6DzTg3 nvEe/ox+WvK9Sgui9knDKPswvKHorYU6nFmf0JdD687kK+A8qU/72B1OdBfStv0gD7Dh IGww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=ZnZllXXln8alDD0gXRFXPDmFsbfIdQAqTJP0jTsTACA=; b=bmi/yjTbTkTGcrKcTPotvQ/ywFTlDbXMdD5Tezw5Lwvd2CHchUxVdJ3NQrz9ZlS7aN X67OemuA4jMxKCHQEj6jIYQVs0gF6lkMvNENsj5DsiLSZou1O/EHfwASx6kdfC1uZz0K a7AuL1bZUB2wGuTtpKNI+jaqh1Rhf7r9Q9SWOD4s+jyiarfwQHR5wZ3zqSlV6OxkObXw tJPDB0iowfA8EUVp3ziKLWCXvZBAHwMG0TiNZJzB1oBK5syBEdGQxpS0R8NDLuzcYEfl k/OGtP1W6Bq58cY59t7yam7ADOBdbS5BHxp6yPFNqoNqK+Ur2zLMlJns4eo4uXEkD6OD ErwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=geUAslRO; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id u10-20020a170903124a00b001541b329c25si15218899plh.611.2022.03.28.14.13.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 14:13:05 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=geUAslRO; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 89FA9580FC; Mon, 28 Mar 2022 14:04:37 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235636AbiC0IC7 (ORCPT + 99 others); Sun, 27 Mar 2022 04:02:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229636AbiC0IC6 (ORCPT ); Sun, 27 Mar 2022 04:02:58 -0400 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D554237A1C; Sun, 27 Mar 2022 01:01:19 -0700 (PDT) Received: by mail-pg1-x52e.google.com with SMTP id b130so8458220pga.13; Sun, 27 Mar 2022 01:01:19 -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; bh=ZnZllXXln8alDD0gXRFXPDmFsbfIdQAqTJP0jTsTACA=; b=geUAslRO0BtqDXhocnaMIbdCadsDyrG8ccZGO0Hr5PrjxML36r1IdKo5wDwvVxbRDP mG9TQ/cPj6yX4sBuCAlUPgLMe21Cm2BGrN61dEL5xw1WxW26ka9Sp5/97HIVSLMVJFGu 1qzq7/Qg30OvKhbb/SceXje2tJKDV61vJHxqHp/OuB12kT1cqQwC1ufBtZY2JWXP4Jgg mteaB8DGleVPUxGtf4PS1/W2SW+PpU8lToiBwGpgF/rlu7DFY29641aeWyFkMJ+NCSuQ HAeN327L7B8MzZBjzrGmh1wDLpTPP6KWea6OGmav6CUbhHKlDSczB0qPqKWVylNqBw0w eFjw== 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; bh=ZnZllXXln8alDD0gXRFXPDmFsbfIdQAqTJP0jTsTACA=; b=1ntrO4xqkNHDx55icE0SmApknpkoYFIoNvcbFHnLRk2S//m8GAHDyRsoPCDQHsXhUa v44/cBbKfxzdLOO0vwLY8/FnfOVOaR+6agJWEf6SFg2T6WUBfONGeqTGFsTxylh2yaqM 8uS/AdLFMMosfUSolDxawTv6MKsNBFw5fPv4356Ar4spKkfcQwestzE08nrEzR8r3zhd 22pawaU63W/NPUah4wS1kQIhUMNm/aRjjFpxD4/+rguk3Dy7vw5e8fhwk0YBA/ZoL2XE PYbpJr6VWbH/XC8vyGwx+qoVy4Z1v000h4YJNMmRTpT8ZVSMIQlGMB9FKOMDKcGzA/Yu JqsA== X-Gm-Message-State: AOAM532TbjpU/3d28bdnLDZKUpwVN8jYdb8UPWawBoGS4ja2eJKPQlyM BRhtDxasxVdpKq0ccMTiSu0= X-Received: by 2002:a63:d13:0:b0:381:f043:c627 with SMTP id c19-20020a630d13000000b00381f043c627mr6074836pgl.168.1648368079326; Sun, 27 Mar 2022 01:01:19 -0700 (PDT) Received: from localhost ([115.220.243.108]) by smtp.gmail.com with ESMTPSA id t7-20020a056a0021c700b004f7916d44bcsm11747823pfj.220.2022.03.27.01.01.18 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 27 Mar 2022 01:01:18 -0700 (PDT) From: Xiaomeng Tong To: song@kernel.org, rgoldwyn@suse.com Cc: linux-raid@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaomeng Tong , stable@vger.kernel.org Subject: [PATCH] md: md2: fix an incorrect NULL check on list iterator Date: Sun, 27 Mar 2022 16:01:11 +0800 Message-Id: <20220327080111.12028-1-xiam0nd.tong@gmail.com> X-Mailer: git-send-email 2.17.1 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The bug is here: if (!rdev || rdev->desc_nr != nr) { The list iterator value 'rdev' will *always* be set and non-NULL by rdev_for_each_rcu(), so it is incorrect to assume that the iterator value will be NULL if the list is empty or no element found (In fact, it will be a bogus pointer to an invalid struct object containing the HEAD). Otherwise it will bypass the check and lead to invalid memory access passing the check. To fix the bug, use a new variable 'iter' as the list iterator, while use the original variable 'pdev' as a dedicated pointer to point to the found element. Cc: stable@vger.kernel.org Fixes: 70bcecdb1534 ("amd-cluster: Improve md_reload_sb to be less error prone") Signed-off-by: Xiaomeng Tong --- drivers/md/md.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/md/md.c b/drivers/md/md.c index 7476fc204172..f156678c08bc 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -9794,16 +9794,18 @@ static int read_rdev(struct mddev *mddev, struct md_rdev *rdev) void md_reload_sb(struct mddev *mddev, int nr) { - struct md_rdev *rdev; + struct md_rdev *rdev = NULL, *iter; int err; /* Find the rdev */ - rdev_for_each_rcu(rdev, mddev) { - if (rdev->desc_nr == nr) + rdev_for_each_rcu(iter, mddev) { + if (iter->desc_nr == nr) { + rdev = iter; break; + } } - if (!rdev || rdev->desc_nr != nr) { + if (!rdev) { pr_warn("%s: %d Could not find rdev with nr %d\n", __func__, __LINE__, nr); return; } -- 2.17.1