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.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS 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 CB39DC433E0 for ; Sat, 1 Aug 2020 00:20:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A6870206D4 for ; Sat, 1 Aug 2020 00:20:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727116AbgHAAUP (ORCPT ); Fri, 31 Jul 2020 20:20:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbgHAAUP (ORCPT ); Fri, 31 Jul 2020 20:20:15 -0400 Received: from shards.monkeyblade.net (shards.monkeyblade.net [IPv6:2620:137:e000::1:9]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1321EC06174A; Fri, 31 Jul 2020 17:20:15 -0700 (PDT) Received: from localhost (unknown [IPv6:2601:601:9f00:477::3d5]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id D7AC511E4590A; Fri, 31 Jul 2020 17:03:28 -0700 (PDT) Date: Fri, 31 Jul 2020 17:20:13 -0700 (PDT) Message-Id: <20200731.172013.46612671169780905.davem@davemloft.net> To: daniel@iogearbox.net Cc: kuba@kernel.org, ast@kernel.org, jolsa@kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: Re: pull-request: bpf 2020-07-31 From: David Miller In-Reply-To: <20200731135145.15003-1-daniel@iogearbox.net> References: <20200731135145.15003-1-daniel@iogearbox.net> X-Mailer: Mew version 6.8 on Emacs 26.3 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Fri, 31 Jul 2020 17:03:29 -0700 (PDT) Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Daniel Borkmann Date: Fri, 31 Jul 2020 15:51:45 +0200 > The following pull-request contains BPF updates for your *net* tree. > > We've added 5 non-merge commits during the last 21 day(s) which contain > a total of 5 files changed, 126 insertions(+), 18 deletions(-). > > The main changes are: > > 1) Fix a map element leak in HASH_OF_MAPS map type, from Andrii Nakryiko. > > 2) Fix a NULL pointer dereference in __btf_resolve_helper_id() when no > btf_vmlinux is available, from Peilin Ye. > > 3) Init pos variable in __bpfilter_process_sockopt(), from Christoph Hellwig. > > 4) Fix a cgroup sockopt verifier test by specifying expected attach type, > from Jean-Philippe Brucker. > > Please consider pulling these changes from: > > git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Pulled. > Note that when net gets merged into net-next later on, there is a small > merge conflict in kernel/bpf/btf.c between commit 5b801dfb7feb ("bpf: Fix > NULL pointer dereference in __btf_resolve_helper_id()") from the bpf tree > and commit 138b9a0511c7 ("bpf: Remove btf_id helpers resolving") from the > net-next tree. > > Resolve as follows: remove the old hunk with the __btf_resolve_helper_id() > function. Change the btf_resolve_helper_id() so it actually tests for a > NULL btf_vmlinux and bails out: ... Noted, thank you.