From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADB69C742BA for ; Fri, 12 Jul 2019 12:39:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 789B820645 for ; Fri, 12 Jul 2019 12:39:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562935173; bh=brf5VmPedC1NgBTv6Aa4yQ1ph1WGBNQpZpbYVc0EDH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JN1OxFoAHVuKGVaqMMIVUvzDDrsn+eXMt0p5QBlNl0f6uJed9P5h3gF0DXRvDlEB7 qHQPvUCrbFYeu3k4Cx+6abfkfdqhmzhbnLxawOZ6blxr12Havs0EaeEseqHBK8IO8k WVoXYlj6astC1JGiSaZejGt7TRe8Z9Goc4s3AlxQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727485AbfGLM1I (ORCPT ); Fri, 12 Jul 2019 08:27:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:38974 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728542AbfGLM1D (ORCPT ); Fri, 12 Jul 2019 08:27:03 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C87C821670; Fri, 12 Jul 2019 12:27:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934422; bh=brf5VmPedC1NgBTv6Aa4yQ1ph1WGBNQpZpbYVc0EDH0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JyT7TYvAfNiqu72CzqS3vNp1WfcURAUpptLHwXLU1wTXJMkBjqrJNVIimdBMWhvHt ZfL3mPtBDqCjX1FHtNcIhxmw3+KBs5CiyBCm4mdD98z3SswAHpXYE/X3tOyxZQelNo bgNpQ4yLnM1IYOhDNjO8Ji4KAzCb/yeO//yIxk40= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Maximets , Jonathan Lemon , Daniel Borkmann , Sasha Levin Subject: [PATCH 5.1 050/138] xdp: check device pointer before clearing Date: Fri, 12 Jul 2019 14:18:34 +0200 Message-Id: <20190712121630.584296399@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 01d76b5317003e019ace561a9b775f51aafdfdc4 ] We should not call 'ndo_bpf()' or 'dev_put()' with NULL argument. Fixes: c9b47cc1fabc ("xsk: fix bug when trying to use both copy and zero-copy on one queue id") Signed-off-by: Ilya Maximets Acked-by: Jonathan Lemon Signed-off-by: Daniel Borkmann Signed-off-by: Sasha Levin --- net/xdp/xdp_umem.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 989e52386c35..2f7e2c33a812 100644 --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@ -143,6 +143,9 @@ static void xdp_umem_clear_dev(struct xdp_umem *umem) struct netdev_bpf bpf; int err; + if (!umem->dev) + return; + if (umem->zc) { bpf.command = XDP_SETUP_XSK_UMEM; bpf.xsk.umem = NULL; @@ -156,11 +159,9 @@ static void xdp_umem_clear_dev(struct xdp_umem *umem) WARN(1, "failed to disable umem!\n"); } - if (umem->dev) { - rtnl_lock(); - xdp_clear_umem_at_qid(umem->dev, umem->queue_id); - rtnl_unlock(); - } + rtnl_lock(); + xdp_clear_umem_at_qid(umem->dev, umem->queue_id); + rtnl_unlock(); if (umem->zc) { dev_put(umem->dev); -- 2.20.1