Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp821488rwb; Mon, 26 Sep 2022 06:20:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6M2ekCgYyugrKTiZrdHx/aVaT33TXmNU8+cPYX+4f27PZMNbf4c1YwpJ250wD12fHO3uxJ X-Received: by 2002:a63:a517:0:b0:43c:e24b:b6cb with SMTP id n23-20020a63a517000000b0043ce24bb6cbmr457405pgf.111.1664198440635; Mon, 26 Sep 2022 06:20:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664198440; cv=none; d=google.com; s=arc-20160816; b=aX0Fg0mNBat5Qdcz7PPOQw33OULDPgHetNK7BvQ2+f/Pi46gPmZcTQeHBgunUGOVAW z1VTL27u5pJTuiOcyYWFJ2mcfqQ3DLe2XtEp8jNtvA19HWYzwY8FEX3/Q0kwI/ZU7yQn vcsOTijvSGDoVYdZhGZHeL6U1jgHbyuoTDm+V0xMqNn1+RET04k3c0cZGej/8O4eki4F p1MZsWB6oHhoTDkrSEaVVlCw9GfVwb5zKpGqKApDLjFFUipEfdV9On+ihMphQ7iVvkJC jVobB74Tpkyz3OtVse/j6qVPPV3EEpfM1Uk212+7oBq07okGRQ07nsRU27fSK3UORCRP 2i2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BR8sOzNPQXw89FlEvGkaVq3mAMS0TW63638sjmMel64=; b=TIcKYPbCmaJXOWBSwY5AQyPsiBy+6Dph/z8jnTT8GbJD5RmdocmDRAadlXGVt+vkIL DRm06tpyyJN1+bZnuOZL8DdeN07g/2fes2NjGXtaSHRM4KOfvxyipXJZ6ZUHzUXk9JqQ FicZ/UC5odEuxj4E/ZaAKLVv89ma6JNAcfiscRK/teTgyCJXup/m5QbfvL9ccFPMA6ch vfH3VQz3nEfTipne+BD03eVoSN+KLclYmpzlMZ8O/xf5urp6/geZrECFzMzov3caXlGx NSP6dNz/n6b/v2/KrveCJMH1ohRYmNjFs7E5Ls2hXn1c7ctVd2HuAvfdmvYc4TlATg3r jA0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BEzwfTN8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f132-20020a636a8a000000b0043c05e17c63si15356145pgc.90.2022.09.26.06.20.28; Mon, 26 Sep 2022 06:20:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=BEzwfTN8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237991AbiIZLfE (ORCPT + 99 others); Mon, 26 Sep 2022 07:35:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42328 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238063AbiIZLdl (ORCPT ); Mon, 26 Sep 2022 07:33:41 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC0136DF96; Mon, 26 Sep 2022 03:43:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 5A915B80906; Mon, 26 Sep 2022 10:41:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90456C433D6; Mon, 26 Sep 2022 10:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1664188881; bh=75DfJ5Yqg1z2SFT3L+O7MKMIFpGoOqNpgcehWq6lixc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BEzwfTN8if5H/RR9ijx1pZnG2KXeFU3DmrAU4LsL29DpU/AI8YoMH+5Djh08IsSA4 7G6H0UnllkyYqaOvMDAqXe36LHrUgig144qetNVppgvLjLO/hzvUyQO3bB9d1FcF2n oX+z0SLmWiv6PSSVxvKX/iEyXwFypNuUe16VqSvI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Haberland , Jan Hoeppner , Jens Axboe Subject: [PATCH 5.15 122/148] s390/dasd: fix Oops in dasd_alias_get_start_dev due to missing pavgroup Date: Mon, 26 Sep 2022 12:12:36 +0200 Message-Id: <20220926100800.723425780@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220926100756.074519146@linuxfoundation.org> References: <20220926100756.074519146@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 From: Stefan Haberland commit db7ba07108a48c0f95b74fabbfd5d63e924f992d upstream. Fix Oops in dasd_alias_get_start_dev() function caused by the pavgroup pointer being NULL. The pavgroup pointer is checked on the entrance of the function but without the lcu->lock being held. Therefore there is a race window between dasd_alias_get_start_dev() and _lcu_update() which sets pavgroup to NULL with the lcu->lock held. Fix by checking the pavgroup pointer with lcu->lock held. Cc: # 2.6.25+ Fixes: 8e09f21574ea ("[S390] dasd: add hyper PAV support to DASD device driver, part 1") Signed-off-by: Stefan Haberland Reviewed-by: Jan Hoeppner Link: https://lore.kernel.org/r/20220919154931.4123002-2-sth@linux.ibm.com Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- drivers/s390/block/dasd_alias.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/drivers/s390/block/dasd_alias.c +++ b/drivers/s390/block/dasd_alias.c @@ -675,12 +675,12 @@ int dasd_alias_remove_device(struct dasd struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device) { struct dasd_eckd_private *alias_priv, *private = base_device->private; - struct alias_pav_group *group = private->pavgroup; struct alias_lcu *lcu = private->lcu; struct dasd_device *alias_device; + struct alias_pav_group *group; unsigned long flags; - if (!group || !lcu) + if (!lcu) return NULL; if (lcu->pav == NO_PAV || lcu->flags & (NEED_UAC_UPDATE | UPDATE_PENDING)) @@ -697,6 +697,11 @@ struct dasd_device *dasd_alias_get_start } spin_lock_irqsave(&lcu->lock, flags); + group = private->pavgroup; + if (!group) { + spin_unlock_irqrestore(&lcu->lock, flags); + return NULL; + } alias_device = group->next; if (!alias_device) { if (list_empty(&group->aliaslist)) {