From patchwork Mon Jul 17 18:42:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 789671 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xBBxr1wn9z9sNx for ; Tue, 18 Jul 2017 04:43:12 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bItpnfvG"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751336AbdGQSnJ (ORCPT ); Mon, 17 Jul 2017 14:43:09 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34732 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751312AbdGQSnI (ORCPT ); Mon, 17 Jul 2017 14:43:08 -0400 Received: by mail-pf0-f194.google.com with SMTP id o88so2324097pfk.1 for ; Mon, 17 Jul 2017 11:43:08 -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=ozoQnl+l5oFV5y1WPB7C8bo3ZgWhN0EDAwjYtg9zLYw=; b=bItpnfvGhh+TXubSfChAeCnVESt9dalMxGQ1EuusXRQHIEvx0YB+dIPQhRL4EPgmMT 8f/56YhVyxaTvGHzXF85upey1bG3pZ2SHwUB3Gd1cGkAOAr2svd9asdx+WlyUZ+UI8Uy iymlZi2D2iKipNS+QoC65BGLf7/yMPy41ujA/BtosgGdvoF12jVX2pv609qxSQgauXiD MxTMbzJdFSo2a4y3N0kJa7Kdr+ZQAhDassERW4eJIoGWJPLiGtiHpCLBouvE0HM1FAMW 9OEXNBW2xMGNOffCT6iIrrExnKUqEKwojwqlHxtawWBb2g24vywLjx6PYjjWGcrEJm+V u+ag== 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=ozoQnl+l5oFV5y1WPB7C8bo3ZgWhN0EDAwjYtg9zLYw=; b=qNtxFCsUGQ3JNhT/XNYnU0+XpyhX35xfH5nMDkz4iOGAhu5wvkEe9IGdlaDg9qp3jw /rjzSr9VSucQsKmGrAxdPFdSJmQ17jo8Gen+x1mqDNVtqH7ANNEc0FrGjLHraWr3fySG 7j835peIV9WXwUBgdp2nNA700OTY2+2cvHfQKDCsSb6JwFQdlTwmYnrh99R1afO7y21T NhwMBFor4CJhxYoj6eZh5GKnn7NLl+/kJTgb/S7AlM7SEGSwFludlboz0FnXMcx5c0Jm Q7X/eH6RvR3f9kadmmRySg1Qhn/FXBpTUHMZ0Dca67zz/i1sdsEI2ChABfmrR3cF54KV 13ug== X-Gm-Message-State: AIVw113nLXDXXiFORIF3c0+QJcxtBgRwTr2ozUHa6wN5GTcisQ9wfiLZ kn40esMse4gZFwOPits= X-Received: by 10.98.245.207 with SMTP id b76mr20295740pfm.113.1500316987841; Mon, 17 Jul 2017 11:43:07 -0700 (PDT) Received: from tw-172-25-30-113.office.twttr.net ([8.25.197.25]) by smtp.gmail.com with ESMTPSA id f70sm49157777pfk.27.2017.07.17.11.43.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Jul 2017 11:43:06 -0700 (PDT) From: Cong Wang To: netdev@vger.kernel.org Cc: dsahern@gmail.com, Cong Wang , Lawrence Brakmo , Daniel Borkmann Subject: [Patch net] bpf: check NULL for sk_to_full_sk() return value Date: Mon, 17 Jul 2017 11:42:55 -0700 Message-Id: <20170717184255.6121-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 When req->rsk_listener is NULL, sk_to_full_sk() returns NULL too, so we have to check its return value against NULL here. Fixes: 40304b2a1567 ("bpf: BPF support for sock_ops") Reported-by: David Ahern Tested-by: David Ahern Cc: Lawrence Brakmo Cc: Daniel Borkmann Signed-off-by: Cong Wang Acked-by: Daniel Borkmann --- include/linux/bpf-cgroup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index 360c082e885c..d41d40ac3efd 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -85,7 +85,7 @@ int __cgroup_bpf_run_filter_sock_ops(struct sock *sk, int __ret = 0; \ if (cgroup_bpf_enabled && (sock_ops)->sk) { \ typeof(sk) __sk = sk_to_full_sk((sock_ops)->sk); \ - if (sk_fullsock(__sk)) \ + if (__sk && sk_fullsock(__sk)) \ __ret = __cgroup_bpf_run_filter_sock_ops(__sk, \ sock_ops, \ BPF_CGROUP_SOCK_OPS); \