From patchwork Fri Nov 3 00:32:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 833596 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZByajzh2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ySjZy3HdZz9sPs for ; Fri, 3 Nov 2017 11:32:25 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934646AbdKCAcX (ORCPT ); Thu, 2 Nov 2017 20:32:23 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:45109 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934556AbdKCAcW (ORCPT ); Thu, 2 Nov 2017 20:32:22 -0400 Received: by mail-pg0-f68.google.com with SMTP id b192so1064381pga.2 for ; Thu, 02 Nov 2017 17:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=mf7R/H4r7osqMDOhY0K0UHj/Uftphg+8VBV5YrBO6I0=; b=ZByajzh2OSMFXLelg8WulwpvAqTFGReA3bJuRuq2hA7F+a7vAXbUyxr6EaZcNCrn26 8Pkyzs4+W56x7MivlUoGpWlmrvYVPOQ845h3ZR0V4J+uOPi3xU1thMVRzUoRJbhfubkJ mzcsxSqf2SiW6DKtFTJo87mbhbiPWCP53YTa34MeVFVsDKHOSKRekI93Dvxr4qhGXHZT C/G0NlC7Le6V8/Vo4/0n+vuDMWI1XTRwDdKZH4wJOWJV06jb7Eh2tx783GibO9a2Xqmj UDsMSCGyRR2/TnLDYmY/nMig81Uod9IcvvAtcKENzVbc9IrJddUDLkD2/daclON5IUNe IJlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mf7R/H4r7osqMDOhY0K0UHj/Uftphg+8VBV5YrBO6I0=; b=Q8kMctGNG6ZQo0auFcOLs3MEPrUGJLv+M4+mX1by3bR/DKwMbMIYnOOg2BVCjFGfZi yLE/SXv2txl7NmNZ4zteP7MFt2JrOh1kefNqn0xRuwL7RoJTVRwYM6AH2RbCBTcxnhFf F1qEn77GNNOm4XOY5e+eIC8XTIsKmXhb6OR+hfEIlTofOsQGPqzNG8Han3FTQpGLu4XC 5NYbt116uf9T+ztshM5vbsK1qbt1FKyVo2bP85AWtWZBgH+DOibjyJVDBGtoph0Vcjce Bjq9dGkGsDtKkzU+eFf2GEay7bsUS1t/7PT/Bx2smWovhHKE72eRoKJqXnwwmQev0Um4 Rn7Q== X-Gm-Message-State: AMCzsaXLx3L90GBjWAk++5KaFtUj4/7+rw3UkZsEm0pbQMDNBTXGSnLF uZGR6giqr1/huZtT8sTNCzR/bfkz X-Google-Smtp-Source: ABhQp+T1QRd3ocDn09BCepahy27E4Xrr3fiBwE3GopEDRsJ86GMiqZ4DyHWSbO8Nr0ZZ+6jiGDIepA== X-Received: by 10.99.149.12 with SMTP id p12mr5114832pgd.381.1509669141485; Thu, 02 Nov 2017 17:32:21 -0700 (PDT) Received: from tw-172-25-30-113.office.twttr.net ([8.25.197.25]) by smtp.gmail.com with ESMTPSA id g7sm8414663pfj.13.2017.11.02.17.32.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Nov 2017 17:32:20 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: dave.taht@gmail.com, Cong Wang , Jiri Pirko Subject: [Patch net-next] net_sched: check NULL in tcf_block_put() Date: Thu, 2 Nov 2017 17:32:08 -0700 Message-Id: <20171103003208.12329-1-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.9.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Callers of tcf_block_put() could pass NULL so we can't use block->q before checking if block is NULL or not. tcf_block_put_ext() callers are fine, it is always non-NULL. Fixes: 8c4083b30e56 ("net: sched: add block bind/unbind notif. and extended block_get/put") Reported-by: Dave Taht Cc: Jiri Pirko Signed-off-by: Cong Wang Reviewed-by: Jiri Pirko --- net/sched/cls_api.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index a26c690b48ac..ad35bb4dffaa 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -340,9 +340,6 @@ void tcf_block_put_ext(struct tcf_block *block, { struct tcf_chain *chain, *tmp; - if (!block) - return; - tcf_block_offload_unbind(block, q, ei); list_for_each_entry_safe(chain, tmp, &block->chain_list, list) @@ -362,6 +359,8 @@ void tcf_block_put(struct tcf_block *block) { struct tcf_block_ext_info ei = {0, }; + if (!block) + return; tcf_block_put_ext(block, NULL, block->q, &ei); }