| Message ID | 20200328.183923.1567579026552407300.davem@davemloft.net |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [GIT] Networking | expand |
On Sat, Mar 28, 2020 at 6:39 PM David Miller <davem@davemloft.net> wrote: > > 1) Fix memory leak in vti6, from Torsten Hilbrich. > > 2) Fix double free in xfrm_policy_timer, from YueHaibing. > > 3) NL80211_ATTR_CHANNEL_WIDTH attribute is put with wrong type, > from Johannes Berg. > > 4) Wrong allocation failure check in qlcnic driver, from Xu Wang. > > 5) Get ks8851-ml IO operations right, for real this time, from > Marek Vasut. Btw, your pull request information really leaves something to be desired. You seem to have randomly picked one thing from each thing you merged (eg that memory leak case from the merge from Steffen Klassert). Hmm? Linus
The pull request you sent on Sat, 28 Mar 2020 18:39:23 -0700 (PDT):
> git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git refs/heads/master
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e595dd94515ed6bc5ba38fce0f9598db8c0ee9a9
Thank you!
From: Linus Torvalds <torvalds@linux-foundation.org> Date: Sat, 28 Mar 2020 19:03:05 -0700 > Btw, your pull request information really leaves something to be desired. > > You seem to have randomly picked one thing from each thing you merged > (eg that memory leak case from the merge from Steffen Klassert). > > Hmm? Yeah I could definitely do better, I try to pick the "highlights" but that didn't work out so definitely this time :-/ Meanwhile, we have a wireless regression, and I'll get the fix for that to you by the end of today. Sorry about all of this.
On Sun, Mar 29, 2020 at 3:52 PM David Miller <davem@davemloft.net> wrote: > > Meanwhile, we have a wireless regression, and I'll get the fix for > that to you by the end of today. Oops. This came in just after I posted the 5.6 release announcement after having said that there didn't seem to be any reason to delay. Oh well. Linus
[Added Johannes.] Linus Torvalds schreef op zo 29-03-2020 om 15:54 [-0700]: > On Sun, Mar 29, 2020 at 3:52 PM David Miller <davem@davemloft.net> wrote: > > Meanwhile, we have a wireless regression, and I'll get the fix for > > that to you by the end of today. > > Oops. This came in just after I posted the 5.6 release announcement > after having said that there didn't seem to be any reason to delay. If this email gets through this should be about "mac80211: fix authentication with iwlwifi/mvm". Is that right? Paul Bolle
On 3/30/20 2:18 PM, Paul Bolle wrote: > [Added Johannes.] > > Linus Torvalds schreef op zo 29-03-2020 om 15:54 [-0700]: >> On Sun, Mar 29, 2020 at 3:52 PM David Miller <davem@davemloft.net> wrote: >>> Meanwhile, we have a wireless regression, and I'll get the fix for >>> that to you by the end of today. >> >> Oops. This came in just after I posted the 5.6 release announcement >> after having said that there didn't seem to be any reason to delay. > > If this email gets through this should be about "mac80211: fix authentication > with iwlwifi/mvm". Is that right? Yes.
1) Fix memory leak in vti6, from Torsten Hilbrich. 2) Fix double free in xfrm_policy_timer, from YueHaibing. 3) NL80211_ATTR_CHANNEL_WIDTH attribute is put with wrong type, from Johannes Berg. 4) Wrong allocation failure check in qlcnic driver, from Xu Wang. 5) Get ks8851-ml IO operations right, for real this time, from Marek Vasut. Please pull, thanks a lot! The following changes since commit 1b649e0bcae71c118c1333e02249a7510ba7f70a: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2020-03-25 13:58:05 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git for you to fetch changes up to a0ba26f37ea04e025a793ef5e5ac809221728ecb: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf (2020-03-27 16:18:51 -0700) ---------------------------------------------------------------- David S. Miller (3): Merge tag 'mac80211-for-net-2020-03-26' of git://git.kernel.org/.../jberg/mac80211 Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge git://git.kernel.org/.../bpf/bpf Greg Kroah-Hartman (2): bpf: Explicitly memset the bpf_attr structure bpf: Explicitly memset some bpf info structures declared on the stack Heiner Kallweit (1): r8169: fix PHY driver check on platforms w/o module softdeps Ido Schimmel (1): mlxsw: spectrum_mr: Fix list iteration in error path Ilan Peer (1): cfg80211: Do not warn on same channel at the end of CSA Johannes Berg (5): nl80211: fix NL80211_ATTR_CHANNEL_WIDTH attribute type ieee80211: fix HE SPR size calculation mac80211: drop data frames without key on encrypted links mac80211: mark station unauthorized before key removal mac80211: set IEEE80211_TX_CTRL_PORT_CTRL_PROTO for nl80211 TX Jouni Malinen (1): mac80211: Check port authorization in the ieee80211_tx_dequeue() case Madhuparna Bhowmik (1): ipv6: xfrm6_tunnel.c: Use built-in RCU list checking Marek Vasut (1): net: ks8851-ml: Fix IO operations, again Martin KaFai Lau (1): bpf: Sanitize the bpf_struct_ops tcp-cc name Nicolas Dichtel (1): vti[6]: fix packet tx through bpf_redirect() in XinY cases Raed Salem (1): xfrm: handle NETDEV_UNREGISTER for xfrm device Torsten Hilbrich (1): vti6: Fix memory leak of skb if input policy check fails Xin Long (3): xfrm: fix uctx len check in verify_sec_ctx_len xfrm: add the missing verify_sec_ctx_len check in xfrm_add_acquire esp: remove the skb from the chain when it's enqueued in cryptd_wq Xu Wang (1): qlcnic: Fix bad kzalloc null test YueHaibing (1): xfrm: policy: Fix doulbe free in xfrm_policy_timer drivers/net/ethernet/mellanox/mlxsw/spectrum_mr.c | 8 ++++---- drivers/net/ethernet/micrel/ks8851_mll.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 16 +++++++--------- include/linux/bpf.h | 1 + include/linux/ieee80211.h | 4 ++-- kernel/bpf/btf.c | 3 ++- kernel/bpf/syscall.c | 34 ++++++++++++++++++++-------------- net/ipv4/Kconfig | 1 + net/ipv4/bpf_tcp_ca.c | 7 ++----- net/ipv4/ip_vti.c | 38 ++++++++++++++++++++++++++++++-------- net/ipv6/ip6_vti.c | 34 ++++++++++++++++++++++++++-------- net/ipv6/xfrm6_tunnel.c | 2 +- net/mac80211/debugfs_sta.c | 3 ++- net/mac80211/key.c | 20 ++++++++++++-------- net/mac80211/sta_info.c | 7 ++++++- net/mac80211/sta_info.h | 1 + net/mac80211/tx.c | 39 +++++++++++++++++++++++++++++++++------ net/wireless/nl80211.c | 2 +- net/wireless/scan.c | 6 +++++- net/xfrm/xfrm_device.c | 9 +++++---- net/xfrm/xfrm_policy.c | 2 ++ net/xfrm/xfrm_user.c | 6 +++++- 23 files changed, 221 insertions(+), 80 deletions(-)