Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp19644lfv; Tue, 12 Apr 2022 15:30:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9hsShpiX/0GgVBc9nNuJde9/yO5hfJbInUmKQkNMpK0MyLYkxVgy2qq4omwb60ymkA8/J X-Received: by 2002:a17:902:e741:b0:14f:a1e1:b9b3 with SMTP id p1-20020a170902e74100b0014fa1e1b9b3mr9544150plf.36.1649802641251; Tue, 12 Apr 2022 15:30:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649802641; cv=none; d=google.com; s=arc-20160816; b=MIP+07VimkChKJbiLZdJKJwpJM/MGIf2WtZxU4h+yYcwFbBRrxESY96Y5vKRt9HjT3 K9/K2L92G6jCupkv1ZhMjricyZu6WO/jA6CpoNo6HA/IzTgpQCFHzkyd78t8+uGa/10R ++os1M4DDtaAZ7gI+2hXC1Xuj9F78et3bvhx930WeBjpXUjEzJ/MQte5U2olF8SCy07j jpMA5UTn2uDHm47MtTxJiroaHF5ohZq0u+FyOdx6SUXIECrgOAhZBcXqa8M0Anm1w+AQ sylhy/0bEb8pOhysD8FfCFb3YBXup/v5DqTe9dqzyyil5tDmG1WmbafV5KbPOxQ2c/eP DJrg== 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=IL9cjWqHWNSLV0kCxJHyvi5kCj0/SLzarchKjkBNZWg=; b=DOvNR/XQbDTlHF+Uf/fkJA7OOXK6GEPHnz5Egv4CVgHgNL4FGT2iwN8X06HgFn+UmO aCp6tVqfmMvhuYDsW0YcTR0xLJVn9APLXbwfDD3qihkD+moylDyKytYKJudKi8Ynm6nJ 5CzrkYgn6QWxz4YpDZQH9VrExm6aNtzx+tCtk2S/OgQ0iBOF/StsodoNGncIMK0XTOtU FfrGDocb8wMQcQQIYRpUaoHdow3p3nTPnkxa+xZf+iYNweaaj1YKC10jjtI5GI62B74k 2b8iAI+CwSWbAQsavu1rBAQgXczV2Jvo7VHRG5EgnoxBMxC0Tp1J+92Z+yxKuYH+UBf1 hlOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rxRj8S08; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id a12-20020a170902eccc00b00153b2d165b0si7549578plh.440.2022.04.12.15.30.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:30:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=rxRj8S08; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1: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: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id D627D1903DB; Tue, 12 Apr 2022 14:08:14 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347546AbiDLI1c (ORCPT + 99 others); Tue, 12 Apr 2022 04:27:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353657AbiDLHZv (ORCPT ); Tue, 12 Apr 2022 03:25:51 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB73626ADE; Tue, 12 Apr 2022 00:02:59 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 2C75A60B65; Tue, 12 Apr 2022 07:02:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42204C385A6; Tue, 12 Apr 2022 07:02:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649746978; bh=c9H0xarlSK5BkS/J8jrXSzFkHfywxLYBfSAVlHGdtAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rxRj8S082UFAC0S6yI1mUe0iSklmzUBnzP8yWmOIEf5oyYVm2s1YMp46u0EXCRcfB qNQuoYexweCP2mWF/o4Fd21pwwq6h3zZr0BPoQPFeBNyelzB1KC0SEQHRM5JBURxKl piTuavp+MIqK7Boh1JyIXrJo7Lo5A8Y8lkxb+CRU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jamie Bainbridge , "David S. Miller" , Sasha Levin Subject: [PATCH 5.16 197/285] qede: confirm skb is allocated before using Date: Tue, 12 Apr 2022 08:30:54 +0200 Message-Id: <20220412062949.347714322@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 From: Jamie Bainbridge [ Upstream commit 4e910dbe36508654a896d5735b318c0b88172570 ] qede_build_skb() assumes build_skb() always works and goes straight to skb_reserve(). However, build_skb() can fail under memory pressure. This results in a kernel panic because the skb to reserve is NULL. Add a check in case build_skb() failed to allocate and return NULL. The NULL return is handled correctly in callers to qede_build_skb(). Fixes: 8a8633978b842 ("qede: Add build_skb() support.") Signed-off-by: Jamie Bainbridge Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qede/qede_fp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c b/drivers/net/ethernet/qlogic/qede/qede_fp.c index 999abcfe3310..17f895250e04 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_fp.c +++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c @@ -747,6 +747,9 @@ qede_build_skb(struct qede_rx_queue *rxq, buf = page_address(bd->data) + bd->page_offset; skb = build_skb(buf, rxq->rx_buf_seg_size); + if (unlikely(!skb)) + return NULL; + skb_reserve(skb, pad); skb_put(skb, len); -- 2.35.1