The bpf selftest build will fail on the stable 5.15 tree with:
CC test_stub.o
BINARY test_verifier
In file included from /home/ubuntu/linux/tools/testing/selftests/bpf/verifier/tests.h:21,
from test_verifier.c:432:
/home/ubuntu/linux/tools/testing/selftests/bpf/verifier/calls.c:124:10: error: 'struct bpf_test' has no member named 'fixup_kfunc_btf_id'
124 | .fixup_kfunc_btf_id = {
| ^~~~~~~~~~~~~~~~~~
/home/ubuntu/linux/tools/testing/selftests/bpf/verifier/calls.c:124:9: warning: braces around scalar initializer
124 | .fixup_kfunc_btf_id = {
| ^
This is because of the fixup_kfunc_btf_id member in struct bpf_test
added in commit 13c6a37d40 ("selftests/bpf: Add test for reg2btf_ids
out of bounds access") from upstream.
We will need commit 0201b80772 ("selftests/bpf: Add test_verifier
support to fixup kfunc call insns") from upstream to solve this build
issue. Some backport work is needed for the 5.15 tree to skip
fixup_map_timer related changes, which came from commit e60e6962c5
("selftests/bpf: Add tests for restricted helpers").
Kumar Kartikeya Dwivedi (1):
selftests/bpf: Add test_verifier support to fixup kfunc call insns
tools/testing/selftests/bpf/test_verifier.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
--
2.7.4
From: Eric Dumazet <edumazet(a)google.com>
commit 6f0012e35160cd08a53e46e3b3bbf724b92dfe68 upstream.
When the third packet of 3WHS connection establishment
contains payload, it is added into socket receive queue
without the XFRM check and the drop of connection tracking
context.
This means that if the data is left unread in the socket
receive queue, conntrack module can not be unloaded.
As most applications usually reads the incoming data
immediately after accept(), bug has been hiding for
quite a long time.
Commit 68822bdf76f1 ("net: generalize skb freeing
deferral to per-cpu lists") exposed this bug because
even if the application reads this data, the skb
with nfct state could stay in a per-cpu cache for
an arbitrary time, if said cpu no longer process RX softirqs.
Many thanks to Ilya Maximets for reporting this issue,
and for testing various patches:
https://lore.kernel.org/netdev/20220619003919.394622-1-i.maximets@ovn.org/
Note that I also added a missing xfrm4_policy_check() call,
although this is probably not a big issue, as the SYN
packet should have been dropped earlier.
Fixes: b59c270104f0 ("[NETFILTER]: Keep conntrack reference until IPsec policy checks are done")
Reported-by: Ilya Maximets <i.maximets(a)ovn.org>
Signed-off-by: Eric Dumazet <edumazet(a)google.com>
Cc: Florian Westphal <fw(a)strlen.de>
Cc: Pablo Neira Ayuso <pablo(a)netfilter.org>
Cc: Steffen Klassert <steffen.klassert(a)secunet.com>
Tested-by: Ilya Maximets <i.maximets(a)ovn.org>
Reviewed-by: Ilya Maximets <i.maximets(a)ovn.org>
Link: https://lore.kernel.org/r/20220623050436.1290307-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba(a)kernel.org>
---
net/ipv4/tcp_ipv4.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index a189625098ba..5d94822fd506 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2014,7 +2014,8 @@ int tcp_v4_rcv(struct sk_buff *skb)
struct sock *nsk;
sk = req->rsk_listener;
- if (unlikely(tcp_v4_inbound_md5_hash(sk, skb, dif, sdif))) {
+ if (unlikely(!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb) ||
+ tcp_v4_inbound_md5_hash(sk, skb, dif, sdif))) {
sk_drops_add(sk, skb);
reqsk_put(req);
goto discard_it;
@@ -2061,6 +2062,7 @@ int tcp_v4_rcv(struct sk_buff *skb)
}
goto discard_and_relse;
}
+ nf_reset_ct(skb);
if (nsk == sk) {
reqsk_put(req);
tcp_v4_restore_cb(skb);
--
2.36.1
Hi Greg,
Following the 5.10.y/5.15.y common series, this is another small
"5.10.y only" update.
I have two more of these (from v5.14 and v5.15) and after that,
5.10.y should be mostly following 5.15.y.
The backports from v5.14 are a little more involved, so the next
"5.10.y only" update is going to take a while longer.
Thanks,
Amir.
Anthony Iliopoulos (1):
xfs: fix xfs_trans slab cache name
Darrick J. Wong (1):
xfs: fix xfs_reflink_unshare usage of filemap_write_and_wait_range
Dave Chinner (2):
xfs: use current->journal_info for detecting transaction recursion
xfs: update superblock counters correctly for !lazysbcount
Gao Xiang (1):
xfs: ensure xfs_errortag_random_default matches XFS_ERRTAG_MAX
Pavel Reichl (2):
xfs: rename variable mp to parsing_mp
xfs: Skip repetitive warnings about mount options
fs/iomap/buffered-io.c | 7 ---
fs/xfs/libxfs/xfs_btree.c | 12 +++-
fs/xfs/libxfs/xfs_sb.c | 16 ++++-
fs/xfs/xfs_aops.c | 17 +++++-
fs/xfs/xfs_error.c | 2 +
fs/xfs/xfs_reflink.c | 3 +-
fs/xfs/xfs_super.c | 120 +++++++++++++++++++++-----------------
fs/xfs/xfs_trans.c | 23 +++-----
fs/xfs/xfs_trans.h | 30 ++++++++++
9 files changed, 148 insertions(+), 82 deletions(-)
--
2.25.1
This is the start of the stable review cycle for the 5.18.9 release.
There are 6 patches in this series, all will be posted as a response
to this one. If anyone has any issues with these being applied, please
let me know.
Responses should be made by Sat, 02 Jul 2022 13:32:22 +0000.
Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.18.9-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.18.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 5.18.9-rc1
Pavel Begunkov <asml.silence(a)gmail.com>
io_uring: fix not locked access to fixed buf table
Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com>
powerpc/ftrace: Remove ftrace init tramp once kernel init is complete
Kees Cook <keescook(a)chromium.org>
hinic: Replace memcpy() with direct assignment
Coly Li <colyli(a)suse.de>
bcache: memset on stack variables in bch_btree_check() and bch_sectors_dirty_init()
Linus Walleij <linus.walleij(a)linaro.org>
clocksource/drivers/ixp4xx: Drop boardfile probe path
Masahiro Yamada <masahiroy(a)kernel.org>
tick/nohz: unexport __init-annotated tick_nohz_full_setup()
-------------
Diffstat:
Makefile | 4 +--
arch/powerpc/include/asm/ftrace.h | 4 ++-
arch/powerpc/kernel/trace/ftrace.c | 15 ++++++++--
arch/powerpc/mm/mem.c | 2 ++
drivers/clocksource/Kconfig | 2 +-
drivers/clocksource/timer-ixp4xx.c | 25 -----------------
drivers/md/bcache/btree.c | 1 +
drivers/md/bcache/writeback.c | 1 +
drivers/net/ethernet/huawei/hinic/hinic_devlink.c | 4 +--
fs/io_uring.c | 34 ++++++++++++-----------
include/linux/platform_data/timer-ixp4xx.h | 11 --------
kernel/time/tick-sched.c | 1 -
12 files changed, 41 insertions(+), 63 deletions(-)