From patchwork Thu Oct 15 19:15:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Borkmann X-Patchwork-Id: 11840053 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 7B09AC43457 for ; Thu, 15 Oct 2020 19:16:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1B97120678 for ; Thu, 15 Oct 2020 19:16:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389838AbgJOTQD (ORCPT ); Thu, 15 Oct 2020 15:16:03 -0400 Received: from www62.your-server.de ([213.133.104.62]:47514 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389812AbgJOTQD (ORCPT ); Thu, 15 Oct 2020 15:16:03 -0400 Received: from 75.57.196.178.dynamic.wline.res.cust.swisscom.ch ([178.196.57.75] helo=localhost) by www62.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1kT8jA-0002CN-MN; Thu, 15 Oct 2020 21:15:52 +0200 From: Daniel Borkmann To: davem@davemloft.net Cc: kuba@kernel.org, daniel@iogearbox.net, ast@kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: pull-request: bpf-next 2020-10-15 Date: Thu, 15 Oct 2020 21:15:52 +0200 Message-Id: <20201015191552.12435-1-daniel@iogearbox.net> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Authenticated-Sender: daniel@iogearbox.net X-Virus-Scanned: Clear (ClamAV 0.102.4/25958/Thu Oct 15 15:56:23 2020) Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Hi David, hi Jakub, The following pull-request contains BPF *fixes* for your *net-next* tree. We've added 4 non-merge commits during the last 3 day(s) which contain a total of 5 files changed, 70 insertions(+), 46 deletions(-). The main changes are: 1) Fix register equivalence tracking in verifier, from Alexei Starovoitov. 2) Fix sockmap error path to not call bpf_prog_put() with NULL, from Alex Dewar. 3) Fix sockmap to add locking annotations to iterator, from Lorenz Bauer. 4) Fix tcp_hdr_options test to use loopback address, from Martin KaFai Lau. Please consider pulling these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git Thanks a lot! Also thanks to reporters, reviewers and testers of commits in this pull-request: Andrii Nakryiko, Jakub Sitnicki, John Fastabend, kernel test robot, Yonghong Song ---------------------------------------------------------------- The following changes since commit ccdf7fae3afaeaf0e5dd03311b86ffa56adf85ae: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (2020-10-12 16:16:50 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git for you to fetch changes up to 83c11c17553c0fca217105c17444c4ef5ab2403f: net, sockmap: Don't call bpf_prog_put() on NULL pointer (2020-10-15 21:05:23 +0200) ---------------------------------------------------------------- Alex Dewar (1): net, sockmap: Don't call bpf_prog_put() on NULL pointer Alexei Starovoitov (1): bpf: Fix register equivalence tracking. Lorenz Bauer (1): bpf, sockmap: Add locking annotations to iterator Martin KaFai Lau (1): bpf, selftest: Fix flaky tcp_hdr_options test when adding addr to lo kernel/bpf/verifier.c | 38 ++++++++++++++-------- net/core/sock_map.c | 24 ++++++++++---- .../selftests/bpf/prog_tests/tcp_hdr_options.c | 26 +-------------- .../bpf/progs/test_misc_tcp_hdr_options.c | 2 +- tools/testing/selftests/bpf/verifier/regalloc.c | 26 +++++++++++++++ 5 files changed, 70 insertions(+), 46 deletions(-)