Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4151435pxb; Mon, 27 Sep 2021 10:26:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyhR1w83roykEy/GP7SL+pDQRUJSERO2Qr7YcukXxA1e535JR3yhn5BfE64Qg2K0GOzuQfq X-Received: by 2002:a63:6981:: with SMTP id e123mr670743pgc.419.1632763566045; Mon, 27 Sep 2021 10:26:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632763566; cv=none; d=google.com; s=arc-20160816; b=0BwEnP1HxkM0Pz+kUqw+7PTEbUF7jxWuimJ1EP/x2dcp1qcUTvMo7CltBcvgjICzqO nvZExujXD8Div6Zpa4HZpELf3B11zmuuBZQVnWLJbRtqZyQuU8s7OtgOwbcyR32LMoXk NULzUr/quKzi8cMTCjcdUOO3yDHufo3Uil9nagvMBn97ihHOfs+TH6AFRsyiilastHlt htSZnW85A0WbRRmb6I2R8w7m9+AkBH2MbW386LdymfdUTCxnkYgIs/D9u9oJ1Mw9Tnzb joNmHX0zUAmfyXMiJAPU1PGJ0kuHw1aqsXljNqXJg6U0j0gYBWPigYS7DRP5VaA2YGeT kWeg== 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=Xuj91YmThudGr7Q4btVBF7Uq/2y1yJaON4nRF80O/Xg=; b=NK12tn6qOf/yt/3v6r27gneP7BXxO/hWMZF+Nrba1hNM8zdWqtHFrxyv20O7aaPAVJ UaLH/3QyBX79PmdrIh3GDShJwHyvzlAPYzr7OIcVZ5ddHMv67hAv4lHiTuZ+PA/jUtc/ u++JOy+aBjDCsHlXaJ1oPw0XWtECNPMRflxAtISzvVCZIeHvg2aCBadlqNb1vC5KjQq7 TOfoi72dVNW90BFNGyNOPBDcrZQ28d5Icaumimox39pGAiji0IZeT73J6qvlCSdfo4/a D3VJESQFZvRvoMCRlhUCV/X8PVT+0Rnz/haTxRv/3/GQgNhI5sF7PZJoLXJL8TfJZRPW RQOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=b3ozN5fA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q13si22058401plk.433.2021.09.27.10.25.51; Mon, 27 Sep 2021 10:26:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=b3ozN5fA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S235919AbhI0R0a (ORCPT + 99 others); Mon, 27 Sep 2021 13:26:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:38056 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237216AbhI0RWb (ORCPT ); Mon, 27 Sep 2021 13:22:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A4DA861356; Mon, 27 Sep 2021 17:14:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632762860; bh=wrxX2eap+yMjhNiAV493M40hjD0C94S0mhDnQ1OmbMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=b3ozN5fA+S4FH+lBWfuLsUGfQGJ28hI3dtPqtDtAHINOy/EytIVe0nrq3gq7AACBj BI7b6tSxvoJjXiUxL7d4e979rt1vWEuO0EQSPEkUZmNVXJyCZ/39GiXNHpYGT6fTaK EgTZipeh1BNNlnpsp3+GPQ6x7CVmAuwa6ZLZ4CMk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefan Raspl , Julian Wiedmann , Alexandra Winter , Jakub Kicinski , Sasha Levin , Heiko Carstens Subject: [PATCH 5.14 078/162] s390/qeth: fix NULL deref in qeth_clear_working_pool_list() Date: Mon, 27 Sep 2021 19:02:04 +0200 Message-Id: <20210927170236.156926418@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927170233.453060397@linuxfoundation.org> References: <20210927170233.453060397@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Julian Wiedmann [ Upstream commit 248f064af222a1f97ee02c84a98013dfbccad386 ] When qeth_set_online() calls qeth_clear_working_pool_list() to roll back after an error exit from qeth_hardsetup_card(), we are at risk of accessing card->qdio.in_q before it was allocated by qeth_alloc_qdio_queues() via qeth_mpc_initialize(). qeth_clear_working_pool_list() then dereferences NULL, and by writing to queue->bufs[i].pool_entry scribbles all over the CPU's lowcore. Resulting in a crash when those lowcore areas are used next (eg. on the next machine-check interrupt). Such a scenario would typically happen when the device is first set online and its queues aren't allocated yet. An early IO error or certain misconfigs (eg. mismatched transport mode, bad portno) then cause us to error out from qeth_hardsetup_card() with card->qdio.in_q still being NULL. Fix it by checking the pointer for NULL before accessing it. Note that we also have (rare) paths inside qeth_mpc_initialize() where a configuration change can cause us to free the existing queues, expecting that subsequent code will allocate them again. If we then error out before that re-allocation happens, the same bug occurs. Fixes: eff73e16ee11 ("s390/qeth: tolerate pre-filled RX buffer") Reported-by: Stefan Raspl Root-caused-by: Heiko Carstens Signed-off-by: Julian Wiedmann Reviewed-by: Alexandra Winter Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/s390/net/qeth_core_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 62f88ccbd03f..51f7f4e680c3 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -207,6 +207,9 @@ static void qeth_clear_working_pool_list(struct qeth_card *card) &card->qdio.in_buf_pool.entry_list, list) list_del(&pool_entry->list); + if (!queue) + return; + for (i = 0; i < ARRAY_SIZE(queue->bufs); i++) queue->bufs[i].pool_entry = NULL; } -- 2.33.0