From patchwork Sun Apr 8 22:28:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Borkmann X-Patchwork-Id: 896069 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=none (p=none dis=none) header.from=iogearbox.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40K7Q30cHgz9s2S for ; Mon, 9 Apr 2018 08:28:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752303AbeDHW2v (ORCPT ); Sun, 8 Apr 2018 18:28:51 -0400 Received: from www62.your-server.de ([213.133.104.62]:54399 "EHLO www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752210AbeDHW2u (ORCPT ); Sun, 8 Apr 2018 18:28:50 -0400 Received: from [62.202.221.10] (helo=localhost) by www62.your-server.de with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.85_2) (envelope-from ) id 1f5Inn-0004TZ-Ly; Mon, 09 Apr 2018 00:28:47 +0200 From: Daniel Borkmann To: davem@davemloft.net Cc: daniel@iogearbox.net, ast@kernel.org, netdev@vger.kernel.org Subject: pull-request: bpf 2018-04-09 Date: Mon, 9 Apr 2018 00:28:47 +0200 Message-Id: <20180408222847.27289-1-daniel@iogearbox.net> X-Mailer: git-send-email 2.9.5 X-Authenticated-Sender: daniel@iogearbox.net X-Virus-Scanned: Clear (ClamAV 0.99.3/24462/Sun Apr 8 22:25:24 2018) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi David, The following pull-request contains BPF updates for your *net* tree. The main changes are: 1) Two sockmap fixes: i) fix a potential warning when a socket with pending cork data is closed by freeing the memory right when the socket is closed instead of seeing still outstanding memory at garbage collector time, ii) fix a NULL pointer deref in case of duplicates release calls, so make sure to only reset the sk_prot pointer when it's in a valid state to do so, both from John. 2) Fix a compilation warning in bpf_prog_attach_check_attach_type() by moving the function under CONFIG_CGROUP_BPF ifdef since only used there, from Anders. Please consider pulling these changes from: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git Thanks a lot! ---------------------------------------------------------------- The following changes since commit 4608f064532c28c0ea3c03fe26a3a5909852811a: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next (2018-04-03 14:08:58 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git for you to fetch changes up to 33491588c1fb2c76ed114a211ad0ee76c16b5a0c: kernel/bpf/syscall: fix warning defined but not used (2018-04-04 11:08:36 +0200) ---------------------------------------------------------------- Anders Roxell (1): kernel/bpf/syscall: fix warning defined but not used John Fastabend (2): bpf: sockmap, free memory on sock close with cork data bpf: sockmap, duplicates release calls may NULL sk_prot kernel/bpf/sockmap.c | 12 ++++++++++-- kernel/bpf/syscall.c | 24 ++++++++++++------------ 2 files changed, 22 insertions(+), 14 deletions(-)