From patchwork Fri Feb 23 06:58:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 876975 X-Patchwork-Delegate: bpf@iogearbox.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="d2usc9UL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3znhsR5BgFz9s7T for ; Fri, 23 Feb 2018 17:59:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751464AbeBWG64 (ORCPT ); Fri, 23 Feb 2018 01:58:56 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:44210 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751411AbeBWG6y (ORCPT ); Fri, 23 Feb 2018 01:58:54 -0500 Received: by mail-pl0-f67.google.com with SMTP id w21so4417967plp.11; Thu, 22 Feb 2018 22:58:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=kb+hMjVdmY7JjmhwKjsaGILdzBEQyGd2PgvtMe03XCc=; b=d2usc9ULIDUIa943YtLr0Y8e7bK2+8PDlZT2P0EzOxYGVM/AugQKZU+pTaRsGrLih1 QrL8tg+5DbpFAkbDiiLM8IaxOTG2I9A0NR3EsKFjk5X9EMfojDFOdoh5EIkzURjNacv5 PR2PYG+B8LiDSFe+78PCldmHfT48BlkSAVKTb96FhjIn3kyk+uCPoHjmj8KGaLsnQoW2 Z67Nmbh4ICt4nWWscicdShacReFXhlXqekyf1lEY05YEU4V3pPWS+UY4KCJWkH3aC0Zp MPX28xi/KZ5Q2r8ItCvRBxLjR6cniGLKallLefCSYDVVtKdYd/kFCP/ePRLj89bY1aug DfIA== 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=kb+hMjVdmY7JjmhwKjsaGILdzBEQyGd2PgvtMe03XCc=; b=AUd+GTiVXv1xnzAbTJi21n4tlYWCmkrrk0UPzpAyHx7GCzhORT4ArfL514XuB7gs0k 4D/2kEwLw0KvuJicaQpJ0plHv0Qs4YmDucI7cuOVtWO99AyXEt7F0nE5Kb/8eQ59oE6k LouAp/GvpQ3uxzejrS/DnhZQj41jMf5xoemHNL/XBikXVVlH2KVF8Pn0D32ya395+nPq N0+WYLF0UTXZa5zfTzLeGWrPfkXwAKeHN+8oqxZX5rRlT64b/TSsTEboBCCUh3QuKLKf IfMblGVwltE+wXyd9iWxlMgpHD3bf72bbfEhdATLZf6W/+y7I2l9qrJZnUZpQyCBPaZl hE6Q== X-Gm-Message-State: APf1xPDO7h2nUqiDYY3javZwpG9FTX/CsXNbJ4MByALk3k+3bA0Q1pk4 Y+tHLIiAlAXL9W/ypqlX+io= X-Google-Smtp-Source: AH8x225LP+CgYcJsu5YaN2CNW9LG+z/MzfMjvkXmb07g77pJ/yxRBYtaF6yqins9VcGfKShzMO45GQ== X-Received: by 2002:a17:902:a517:: with SMTP id s23-v6mr772322plq.1.1519369134289; Thu, 22 Feb 2018 22:58:54 -0800 (PST) Received: from li1588-6.members.linode.com (li1588-6.members.linode.com. [139.162.104.6]) by smtp.gmail.com with ESMTPSA id 76sm3611455pfp.53.2018.02.22.22.58.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 22:58:52 -0800 (PST) From: Yafang Shao To: dsa@cumulusnetworks.com, ast@kernel.org, daniel@iogearbox.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH bpf-next] bpf: NULL pointer check is not needed in BPF_CGROUP_RUN_PROG_INET_SOCK Date: Fri, 23 Feb 2018 14:58:41 +0800 Message-Id: <1519369121-22269-1-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org sk is already allocated in inet_create/inet6_create, hence when BPF_CGROUP_RUN_PROG_INET_SOCK is executed sk will never be NULL. The logic is as bellow, sk = sk_alloc(); if (!sk) goto out; BPF_CGROUP_RUN_PROG_INET_SOCK(sk); Signed-off-by: Yafang Shao Acked-by: David S. Miller --- include/linux/bpf-cgroup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index a7f16e0..8a45666 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -96,7 +96,7 @@ int __cgroup_bpf_check_dev_permission(short dev_type, u32 major, u32 minor, #define BPF_CGROUP_RUN_PROG_INET_SOCK(sk) \ ({ \ int __ret = 0; \ - if (cgroup_bpf_enabled && sk) { \ + if (cgroup_bpf_enabled) { \ __ret = __cgroup_bpf_run_filter_sk(sk, \ BPF_CGROUP_INET_SOCK_CREATE); \ } \