netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: netfilter-devel@vger.kernel.org
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: [PATCH 0/2] Netfilter fixes for net
Date: Sat,  4 Jul 2020 02:13:57 +0200	[thread overview]
Message-ID: <20200704001359.1304-1-pablo@netfilter.org> (raw)

Hi,

The following patchset contains Netfilter fixes for net:

1) Use kvfree() to release vmalloc()'ed areas in ipset, from Eric Dumazet.

2) UAF in nfnetlink_queue from the nf_conntrack_update() path.

Please, pull these changes from:

  git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git

Thank you.

----------------------------------------------------------------

The following changes since commit 33c568ba49e2b0ff7c3daead5d9427be797a4c43:

  Merge tag 'mac80211-for-net-2020-06-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (2020-06-29 16:58:30 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git HEAD

for you to fetch changes up to d005fbb855d3b5660d62ee5a6bd2d99c13ff8cf3:

  netfilter: conntrack: refetch conntrack after nf_conntrack_update() (2020-07-03 14:47:03 +0200)

----------------------------------------------------------------
Eric Dumazet (1):
      netfilter: ipset: call ip_set_free() instead of kfree()

Pablo Neira Ayuso (1):
      netfilter: conntrack: refetch conntrack after nf_conntrack_update()

 net/netfilter/ipset/ip_set_bitmap_ip.c    | 2 +-
 net/netfilter/ipset/ip_set_bitmap_ipmac.c | 2 +-
 net/netfilter/ipset/ip_set_bitmap_port.c  | 2 +-
 net/netfilter/ipset/ip_set_hash_gen.h     | 4 ++--
 net/netfilter/nf_conntrack_core.c         | 2 ++
 5 files changed, 7 insertions(+), 5 deletions(-)

             reply	other threads:[~2020-07-04  0:14 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-04  0:13 Pablo Neira Ayuso [this message]
2020-07-04  0:13 ` [PATCH 1/2] netfilter: ipset: call ip_set_free() instead of kfree() Pablo Neira Ayuso
2020-07-04  0:13 ` [PATCH 2/2] netfilter: conntrack: refetch conntrack after nf_conntrack_update() Pablo Neira Ayuso
2020-07-05  0:47 ` [PATCH 0/2] Netfilter fixes for net David Miller
  -- strict thread matches above, loose matches on Subject: below --
2020-04-29 21:48 Pablo Neira Ayuso
2020-05-01  1:07 ` David Miller
2020-04-21 10:37 Pablo Neira Ayuso
2020-04-21 18:50 ` David Miller
2019-10-02 18:53 Pablo Neira Ayuso
2019-10-02 20:23 ` David Miller
2019-02-11 16:53 Pablo Neira Ayuso
2019-02-11 18:43 ` David Miller
2017-11-01 18:48 Pablo Neira Ayuso
2017-11-02  7:53 ` David Miller
2017-09-20 10:49 Pablo Neira Ayuso
2017-09-20 23:08 ` David Miller
2017-07-06 12:54 Pablo Neira Ayuso
2017-07-06 13:03 ` David Miller
2015-12-22 17:53 Pablo Neira Ayuso
2015-12-22 19:55 ` David Miller
2015-04-27 18:41 Pablo Neira Ayuso
2015-04-28  3:13 ` David Miller
2014-11-20 12:30 Pablo Neira Ayuso
2014-11-21  5:12 ` David Miller
2014-01-07 22:13 [PATCH 0/2] netfilter " Pablo Neira Ayuso
2014-01-07 23:38 ` David Miller
2013-12-13 18:24 Pablo Neira Ayuso
2013-12-17 20:07 ` David Miller
2013-04-19  1:16 Pablo Neira Ayuso
2013-04-19 18:25 ` David Miller
2013-02-26 13:45 pablo
2013-02-26 22:24 ` David Miller
2012-11-22  9:10 pablo
2012-11-22 20:28 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200704001359.1304-1-pablo@netfilter.org \
    --to=pablo@netfilter.org \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).