From patchwork Wed Dec 26 07:54:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 1019129 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=wanadoo.fr Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="i1AlHksi"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43R2G43PTVz9s55 for ; Fri, 28 Dec 2018 20:58:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=46B38reWfbGkQJVllo4aF1Ccq+U4MsApiKS0ZUCfHYk=; b=i1AlHksifj88Dj pzJIE0wt+6DWnBLnPkrajDC0KccAlm54tnp1Iw9j0d+lDt9pnqsyJXBZNHw2UDPI2bD5d4oMYpEzr sgSGUFET1N6LJuSaaJxpvjz7dH7rroBQlP3EEpJhDNZnRR8IlMWBFgIZue0zVAz+TfJZ8pK2EWzqE 14CvTful131itXTc6B7mIf4h44ESx3eOWTXYJItDVUlPrNDZ3PiQ5gJKM8jDQSq2Ou73urr2J0lu3 HsfLR0TgFOKgyP1TXHrCoS36Gm/+klXW2g1Im964F3ujQHPGTytqkunf5mj/arNN00ty2u1O5/A5+ rzXKbXysCviUbEVxh9kw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gcou1-0001vN-Fo; Fri, 28 Dec 2018 09:58:01 +0000 Received: from smtp02.smtpout.orange.fr ([80.12.242.124] helo=smtp.smtpout.orange.fr) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gcotx-0001tR-Ap for linux-um@lists.infradead.org; Fri, 28 Dec 2018 09:57:59 +0000 Received: from localhost.localdomain ([90.126.241.217]) by mwinf5d25 with ME id HMxa1z0094i89ZE03Mxae3; Fri, 28 Dec 2018 10:57:39 +0100 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Fri, 28 Dec 2018 10:57:39 +0100 X-ME-IP: 90.126.241.217 From: Christophe JAILLET To: jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, rppt@linux.vnet.ibm.com, akpm@linux-foundation.org, yuehaibing@huawei.com, keescook@chromium.org Subject: [PATCH 1/2] um: vector: Fix a potential NULL pointer dereference in 'vector_net_open()' Date: Wed, 26 Dec 2018 08:54:36 +0100 Message-Id: <20181226075436.11018-1-christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181228_015757_723689_7DA0D301 X-CRM114-Status: GOOD ( 13.06 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [80.12.242.124 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (christophe.jaillet[at]wanadoo.fr) X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, Christophe JAILLET , linux-um@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 'create_queue()' returns NULL in case of memory allocation failure. So we must check if it succeeds in order to avoid potential NULL pointer dereference. For 'vp->rx_queue', the dereference would occur just one line after the failed allocation. For 'vp->tx_queue', it would occur later during normal processing. Fixes: 49da7e64f33e ("High Performance UML Vector Network Driver") Signed-off-by: Christophe JAILLET Reviewed-by: Kees Cook --- arch/um/drivers/vector_kern.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c index 046fa9ea0ccc..5b917716289d 100644 --- a/arch/um/drivers/vector_kern.c +++ b/arch/um/drivers/vector_kern.c @@ -1182,6 +1182,8 @@ static int vector_net_open(struct net_device *dev) vp->rx_header_size, MAX_IOV_SIZE ); + if (!vp->rx_queue) + goto out_close; vp->rx_queue->queue_depth = get_depth(vp->parsed); } else { vp->header_rxbuffer = kmalloc( @@ -1198,6 +1200,8 @@ static int vector_net_open(struct net_device *dev) vp->header_size, MAX_IOV_SIZE ); + if (!vp->tx_queue) + goto out_close; } else { vp->header_txbuffer = kmalloc(vp->header_size, GFP_KERNEL); if (vp->header_txbuffer == NULL)