From: Greg Kroah-Hartman Date: Sun, 30 Jan 2022 20:39:50 +0000 (+0100) Subject: Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable... X-Git-Tag: v5.4.176~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8344fde23319b0ff6e60c50b71965183c732303a;p=thirdparty%2Fkernel%2Fstable-queue.git Merge branch 'master' of gitolite.kernel.org:/pub/scm/linux/kernel/git/stable/stable-queue Mess of a merge, my fault :( --- 8344fde23319b0ff6e60c50b71965183c732303a diff --cc queue-4.14/drm-msm-fix-wrong-size-calculation.patch index ce517b11410,18534904116..2f85ce09eaf --- a/queue-4.14/drm-msm-fix-wrong-size-calculation.patch +++ b/queue-4.14/drm-msm-fix-wrong-size-calculation.patch @@@ -23,14 -23,16 +23,15 @@@ Fixes: 072f1f9168ed ("drm/msm: add supp Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com Signed-off-by: Dmitry Baryshkov +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c -index 3dad4687d3ddc..7951f57f92027 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c -@@ -321,7 +321,7 @@ static int msm_init_vram(struct drm_device *dev) +@@ -321,7 +321,7 @@ static int msm_init_vram(struct drm_devi of_node_put(node); if (ret) return ret; diff --cc queue-4.14/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch index d837e70fc28,276db1b237c..7d00749bd7d --- a/queue-4.14/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +++ b/queue-4.14/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch @@@ -1,5 -1,5 +1,5 @@@ - From a66c5ed539277b9f2363bbace0dba88b85b36c26 Mon Sep 17 00:00:00 2001 - From: Guenter Roeck -From 9b70557687696c795fbb7207c4108a89f2b74ff4 Mon Sep 17 00:00:00 2001 ++From ea27de255a5a5694bbb94e10547cac19f6bfe21f Mon Sep 17 00:00:00 2001 + From: Sasha Levin Date: Thu, 6 Jan 2022 11:48:52 -0800 Subject: hwmon: (lm90) Reduce maximum conversion rate for G781 @@@ -21,14 -21,16 +21,14 @@@ the problem Fixes: ae544f64cc7b ("hwmon: (lm90) Add support for GMT G781") Signed-off-by: Guenter Roeck - Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 30a7f7fde6511..033c89f8359d1 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -359,7 +359,7 @@ static const struct lm90_params lm90_params[] = { +@@ -359,7 +359,7 @@ static const struct lm90_params lm90_par .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT | LM90_HAVE_BROKEN_ALERT, .alert_alarms = 0x7c, diff --cc queue-4.14/ipv4-tcp-send-zero-ipid-in-synack-messages.patch index 00000000000,25cd9212865..2a111610d73 mode 000000,100644..100644 --- a/queue-4.14/ipv4-tcp-send-zero-ipid-in-synack-messages.patch +++ b/queue-4.14/ipv4-tcp-send-zero-ipid-in-synack-messages.patch @@@ -1,0 -1,77 +1,72 @@@ + From aabf61bb3cb715779c32f9486c239239b1d070fe Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 26 Jan 2022 17:10:21 -0800 + Subject: ipv4: tcp: send zero IPID in SYNACK messages + + From: Eric Dumazet + + [ Upstream commit 970a5a3ea86da637471d3cd04d513a0755aba4bf ] + + In commit 431280eebed9 ("ipv4: tcp: send zero IPID for RST and + ACK sent in SYN-RECV and TIME-WAIT state") we took care of some + ctl packets sent by TCP. + + It turns out we need to use a similar strategy for SYNACK packets. + + By default, they carry IP_DF and IPID==0, but there are ways + to ask them to use the hashed IP ident generator and thus + be used to build off-path attacks. + (Ref: Off-Path TCP Exploits of the Mixed IPID Assignment) + + One of this way is to force (before listener is started) + echo 1 >/proc/sys/net/ipv4/ip_no_pmtu_disc + + Another way is using forged ICMP ICMP_FRAG_NEEDED + with a very small MTU (like 68) to force a false return from + ip_dont_fragment() + + In this patch, ip_build_and_send_pkt() uses the following + heuristics. + + 1) Most SYNACK packets are smaller than IPV4_MIN_MTU and therefore + can use IP_DF regardless of the listener or route pmtu setting. + + 2) In case the SYNACK packet is bigger than IPV4_MIN_MTU, + we use prandom_u32() generator instead of the IPv4 hashed ident one. + + Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") + Signed-off-by: Eric Dumazet + Reported-by: Ray Che + Reviewed-by: David Ahern + Cc: Geoff Alexander + Cc: Willy Tarreau + Signed-off-by: Jakub Kicinski + Signed-off-by: Sasha Levin + --- - net/ipv4/ip_output.c | 11 +++++++++-- ++ net/ipv4/ip_output.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + -diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c -index c9f82525bfa45..aab18ab49e3b9 100644 + --- a/net/ipv4/ip_output.c + +++ b/net/ipv4/ip_output.c -@@ -160,12 +160,19 @@ int ip_build_and_send_pkt(struct sk_buff *skb, const struct sock *sk, ++@@ -160,12 +160,19 @@ int ip_build_and_send_pkt(struct sk_buff + iph->daddr = (opt && opt->opt.srr ? opt->opt.faddr : daddr); + iph->saddr = saddr; + iph->protocol = sk->sk_protocol; + - if (ip_dont_fragment(sk, &rt->dst)) { + + /* Do not bother generating IPID for small packets (eg SYNACK) */ + + if (skb->len <= IPV4_MIN_MTU || ip_dont_fragment(sk, &rt->dst)) { + iph->frag_off = htons(IP_DF); + iph->id = 0; + } else { + iph->frag_off = 0; + - __ip_select_ident(net, iph, 1); + + /* TCP packets here are SYNACK with fat IPv4/TCP options. + + * Avoid using the hashed IP ident generator. + + */ + + if (sk->sk_protocol == IPPROTO_TCP) + + iph->id = (__force __be16)prandom_u32(); + + else + + __ip_select_ident(net, iph, 1); + } + + if (opt && opt->opt.optlen) { --- -2.34.1 - diff --cc queue-4.14/net-fix-information-leakage-in-proc-net-ptype.patch index 5a1bf2f80c0,c3b7c0a37dc..4bc2cad9ccc --- a/queue-4.14/net-fix-information-leakage-in-proc-net-ptype.patch +++ b/queue-4.14/net-fix-information-leakage-in-proc-net-ptype.patch @@@ -20,13 -20,15 +20,14 @@@ must be checked when it is not NULL Fixes: 2feb27dbe00c ("[NETNS]: Minor information leak via /proc/net/ptype file.") Signed-off-by: Congyu Liu Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - include/linux/netdevice.h | 1 + - net/core/net-procfs.c | 3 ++- - net/packet/af_packet.c | 2 ++ + include/linux/netdevice.h | 1 + + net/core/net-procfs.c | 3 ++- + net/packet/af_packet.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index fc552da905b3a..7972aac9264c0 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2206,6 +2206,7 @@ struct packet_type { diff --cc queue-4.14/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch index bc77f01d622,8de54c72469..ca8cc8a40f8 --- a/queue-4.14/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +++ b/queue-4.14/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch @@@ -27,14 -27,16 +27,15 @@@ Fixes: c319b4d76b9e ("net: ipv4: add IP Reported-by: Hangbin Liu Signed-off-by: Xin Long Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv4/ping.c | 3 ++- + net/ipv4/ping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c -index aab141c4a3892..bfd0ab9d3b578 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c -@@ -225,7 +225,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) +@@ -225,7 +225,8 @@ static struct sock *ping_lookup(struct n continue; } diff --cc queue-4.14/series index d8c31bc6d9c,0424ceeb268..44185972baa --- a/queue-4.14/series +++ b/queue-4.14/series @@@ -21,14 -21,16 +21,18 @@@ i40e-fix-unsigned-stat-widths.patc rpmsg-char-fix-race-between-the-release-of-rpmsg_ctrldev-and-cdev.patch rpmsg-char-fix-race-between-the-release-of-rpmsg_eptdev-and-cdev.patch scsi-bnx2fc-flush-destroy_work-queue-before-calling-bnx2fc_interface_put.patch -nfsv4-handle-case-where-the-lookup-of-a-directory-fa.patch -nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non.patch -arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabl.patch +ipv6_tunnel-rate-limit-warning-messages.patch +arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabled.patch net-fix-information-leakage-in-proc-net-ptype.patch -hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch -ibmvnic-don-t-spin-in-tasklet.patch ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +ipv4-avoid-using-shared-ip-generator-for-connected-sockets.patch +hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +nfsv4-handle-case-where-the-lookup-of-a-directory-fails.patch +nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non-regular-file.patch +net-procfs-show-net-devices-bound-packet-types.patch drm-msm-fix-wrong-size-calculation.patch -drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_e.patch +drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_enable.patch ++ibmvnic-don-t-spin-in-tasklet.patch + yam-fix-a-memory-leak-in-yam_siocdevprivate.patch + ipv4-raw-lock-the-socket-in-raw_bind.patch + ipv4-tcp-send-zero-ipid-in-synack-messages.patch -ipv4-avoid-using-shared-ip-generator-for-connected-s.patch diff --cc queue-4.19/drm-msm-fix-wrong-size-calculation.patch index b6a5bf90dd7,ab97e0c9544..40d057c987d --- a/queue-4.19/drm-msm-fix-wrong-size-calculation.patch +++ b/queue-4.19/drm-msm-fix-wrong-size-calculation.patch @@@ -23,14 -23,16 +23,15 @@@ Fixes: 072f1f9168ed ("drm/msm: add supp Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com Signed-off-by: Dmitry Baryshkov +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c -index 08ff9d7645d74..11bad11101b9e 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c -@@ -388,7 +388,7 @@ static int msm_init_vram(struct drm_device *dev) +@@ -388,7 +388,7 @@ static int msm_init_vram(struct drm_devi of_node_put(node); if (ret) return ret; diff --cc queue-4.19/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch index d837e70fc28,83a547946c4..7d00749bd7d --- a/queue-4.19/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +++ b/queue-4.19/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch @@@ -1,5 -1,5 +1,5 @@@ - From a66c5ed539277b9f2363bbace0dba88b85b36c26 Mon Sep 17 00:00:00 2001 - From: Guenter Roeck -From ba9c1a50d67d7ada6e1714b306a9eef83d31c2d3 Mon Sep 17 00:00:00 2001 ++From ea27de255a5a5694bbb94e10547cac19f6bfe21f Mon Sep 17 00:00:00 2001 + From: Sasha Levin Date: Thu, 6 Jan 2022 11:48:52 -0800 Subject: hwmon: (lm90) Reduce maximum conversion rate for G781 @@@ -21,14 -21,16 +21,14 @@@ the problem Fixes: ae544f64cc7b ("hwmon: (lm90) Add support for GMT G781") Signed-off-by: Guenter Roeck - Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 30a7f7fde6511..033c89f8359d1 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -359,7 +359,7 @@ static const struct lm90_params lm90_params[] = { +@@ -359,7 +359,7 @@ static const struct lm90_params lm90_par .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT | LM90_HAVE_BROKEN_ALERT, .alert_alarms = 0x7c, diff --cc queue-4.19/ipv6_tunnel-rate-limit-warning-messages.patch index 68d1713cfde,1e14fa157ae..723e83d03f7 --- a/queue-4.19/ipv6_tunnel-rate-limit-warning-messages.patch +++ b/queue-4.19/ipv6_tunnel-rate-limit-warning-messages.patch @@@ -18,11 -18,13 +18,12 @@@ Tested-by: Maksym Yaremchuk Reviewed-by: Amit Cohen Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv6/ip6_tunnel.c | 8 ++++---- + net/ipv6/ip6_tunnel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c -index 35c127c3eee78..b647a40376795 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1005,14 +1005,14 @@ int ip6_tnl_xmit_ctl(struct ip6_tnl *t, diff --cc queue-4.19/net-fix-information-leakage-in-proc-net-ptype.patch index ab2d025e185,04ef19ebb5b..94e1caf6a4a --- a/queue-4.19/net-fix-information-leakage-in-proc-net-ptype.patch +++ b/queue-4.19/net-fix-information-leakage-in-proc-net-ptype.patch @@@ -20,13 -20,15 +20,14 @@@ must be checked when it is not NULL Fixes: 2feb27dbe00c ("[NETNS]: Minor information leak via /proc/net/ptype file.") Signed-off-by: Congyu Liu Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - include/linux/netdevice.h | 1 + - net/core/net-procfs.c | 3 ++- - net/packet/af_packet.c | 2 ++ + include/linux/netdevice.h | 1 + + net/core/net-procfs.c | 3 ++- + net/packet/af_packet.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 50ab7c8fd3090..58ee9d2d6a3ca 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2346,6 +2346,7 @@ struct packet_type { diff --cc queue-4.19/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch index 00000000000,16db40f435a..b73e11a7dbf mode 000000,100644..100644 --- a/queue-4.19/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch +++ b/queue-4.19/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch @@@ -1,0 -1,37 +1,32 @@@ + From fe4bc149a3243679b4acc4b424ab7f890957d96d Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:15 -0500 + Subject: NFS: Ensure the server has an up to date ctime before hardlinking + + From: Trond Myklebust + + [ Upstream commit 204975036b34f55237bc44c8a302a88468ef21b5 ] + + Creating a hard link is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: 9f7682728728 ("NFS: Move the delegation return down into nfs4_proc_link()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index 733fd9e4f0a15..f53304bd99fc7 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2015,6 +2015,8 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) ++@@ -2033,6 +2033,8 @@ nfs_link(struct dentry *old_dentry, stru + + trace_nfs_link_enter(inode, dir, dentry); + d_drop(dentry); + + if (S_ISREG(inode->i_mode)) + + nfs_sync_inode(inode); + error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name); + if (error == 0) { + ihold(inode); --- -2.34.1 - diff --cc queue-4.19/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-847 index 00000000000,320a0c4d423..6c60ffd0219 mode 000000,100644..100644 --- a/queue-4.19/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-847 +++ b/queue-4.19/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-847 @@@ -1,0 -1,37 +1,32 @@@ + From 1882de15064f71260908d2e36afcbefe0ba45307 Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:16 -0500 + Subject: NFS: Ensure the server has an up to date ctime before renaming + + From: Trond Myklebust + + [ Upstream commit 6ff9d99bb88faebf134ca668842349d9718e5464 ] + + Renaming a file is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: f2c2c552f119 ("NFS: Move delegation recall into the NFSv4 callback for rename_setup()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index f53304bd99fc7..432470502838c 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2105,6 +2105,8 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, ++@@ -2123,6 +2123,8 @@ int nfs_rename(struct inode *old_dir, st + } + } + + + if (S_ISREG(old_inode->i_mode)) + + nfs_sync_inode(old_inode); + task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL); + if (IS_ERR(task)) { + error = PTR_ERR(task); --- -2.34.1 - diff --cc queue-4.19/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch index bc77f01d622,3eb71b3f1ae..ca8cc8a40f8 --- a/queue-4.19/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +++ b/queue-4.19/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch @@@ -27,14 -27,16 +27,15 @@@ Fixes: c319b4d76b9e ("net: ipv4: add IP Reported-by: Hangbin Liu Signed-off-by: Xin Long Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv4/ping.c | 3 ++- + net/ipv4/ping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c -index 862744c285482..276442443d322 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c -@@ -225,7 +225,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) +@@ -225,7 +225,8 @@ static struct sock *ping_lookup(struct n continue; } diff --cc queue-4.19/series index 7212ab25a7b,9b948124299..a52c5600133 --- a/queue-4.19/series +++ b/queue-4.19/series @@@ -24,15 -24,22 +24,23 @@@ i40e-fix-unsigned-stat-widths.patc rpmsg-char-fix-race-between-the-release-of-rpmsg_ctrldev-and-cdev.patch rpmsg-char-fix-race-between-the-release-of-rpmsg_eptdev-and-cdev.patch scsi-bnx2fc-flush-destroy_work-queue-before-calling-bnx2fc_interface_put.patch -nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch -nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-847 -nfsv4-handle-case-where-the-lookup-of-a-directory-fa.patch -nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non.patch -arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabl.patch -net-fix-information-leakage-in-proc-net-ptype.patch ipv6_tunnel-rate-limit-warning-messages.patch -phylib-fix-potential-use-after-free.patch +arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabled.patch +net-fix-information-leakage-in-proc-net-ptype.patch +ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +ipv4-avoid-using-shared-ip-generator-for-connected-sockets.patch hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +nfsv4-handle-case-where-the-lookup-of-a-directory-fails.patch +nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non-regular-file.patch net-procfs-show-net-devices-bound-packet-types.patch +drm-msm-fix-wrong-size-calculation.patch +drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_enable.patch +ipv6-annotate-accesses-to-fn-fn_sernum.patch ++nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch ++nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-847 ++phylib-fix-potential-use-after-free.patch + ibmvnic-init-running_cap_crqs-early.patch + ibmvnic-don-t-spin-in-tasklet.patch -ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch -drm-msm-fix-wrong-size-calculation.patch -drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_e.patch + yam-fix-a-memory-leak-in-yam_siocdevprivate.patch + ipv4-raw-lock-the-socket-in-raw_bind.patch + ipv4-tcp-send-zero-ipid-in-synack-messages.patch -ipv4-avoid-using-shared-ip-generator-for-connected-s.patch diff --cc queue-4.4/drm-msm-fix-wrong-size-calculation.patch index e4ddcc8b5cf,4d41319653d..98db902320b --- a/queue-4.4/drm-msm-fix-wrong-size-calculation.patch +++ b/queue-4.4/drm-msm-fix-wrong-size-calculation.patch @@@ -23,14 -23,16 +23,15 @@@ Fixes: 072f1f9168ed ("drm/msm: add supp Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com Signed-off-by: Dmitry Baryshkov +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c -index 24d45fc7716c5..c9853626cec4e 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c -@@ -286,7 +286,7 @@ static int msm_init_vram(struct drm_device *dev) +@@ -286,7 +286,7 @@ static int msm_init_vram(struct drm_devi ret = of_address_to_resource(node, 0, &r); if (ret) return ret; diff --cc queue-4.4/net-fix-information-leakage-in-proc-net-ptype.patch index e29df24fc81,ee46634763c..a6054636501 --- a/queue-4.4/net-fix-information-leakage-in-proc-net-ptype.patch +++ b/queue-4.4/net-fix-information-leakage-in-proc-net-ptype.patch @@@ -20,13 -20,15 +20,14 @@@ must be checked when it is not NULL Fixes: 2feb27dbe00c ("[NETNS]: Minor information leak via /proc/net/ptype file.") Signed-off-by: Congyu Liu Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - include/linux/netdevice.h | 1 + - net/core/net-procfs.c | 3 ++- - net/packet/af_packet.c | 2 ++ + include/linux/netdevice.h | 1 + + net/core/net-procfs.c | 3 ++- + net/packet/af_packet.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 401a404b64b93..78864ffaf0d71 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2055,6 +2055,7 @@ struct packet_type { diff --cc queue-4.4/series index 18d3a4413b0,aeeb29c9b2f..3fa74557195 --- a/queue-4.4/series +++ b/queue-4.4/series @@@ -11,9 -11,9 +11,12 @@@ tty-add-support-for-brainboxes-uc-cards usb-storage-add-unusual-devs-entry-for-vl817-usb-sata-bridge.patch usb-core-fix-hang-in-usb_kill_urb-by-adding-memory-barriers.patch scsi-bnx2fc-flush-destroy_work-queue-before-calling-bnx2fc_interface_put.patch +ipv6_tunnel-rate-limit-warning-messages.patch +arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabled.patch net-fix-information-leakage-in-proc-net-ptype.patch -hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +ipv4-avoid-using-shared-ip-generator-for-connected-sockets.patch +net-procfs-show-net-devices-bound-packet-types.patch drm-msm-fix-wrong-size-calculation.patch ++hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch + ipv4-raw-lock-the-socket-in-raw_bind.patch + ipv4-tcp-send-zero-ipid-in-synack-messages.patch -ipv4-avoid-using-shared-ip-generator-for-connected-s.patch diff --cc queue-4.9/drm-msm-fix-wrong-size-calculation.patch index 93b287b2404,51a5e2bb95b..6cc3d86e265 --- a/queue-4.9/drm-msm-fix-wrong-size-calculation.patch +++ b/queue-4.9/drm-msm-fix-wrong-size-calculation.patch @@@ -23,14 -23,16 +23,15 @@@ Fixes: 072f1f9168ed ("drm/msm: add supp Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com Signed-off-by: Dmitry Baryshkov +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c -index ce32f41fc28aa..94fded3daaa30 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c -@@ -297,7 +297,7 @@ static int msm_init_vram(struct drm_device *dev) +@@ -297,7 +297,7 @@ static int msm_init_vram(struct drm_devi of_node_put(node); if (ret) return ret; diff --cc queue-4.9/net-fix-information-leakage-in-proc-net-ptype.patch index 0f59ec8fc0a,7b730a2b68f..0562647c318 --- a/queue-4.9/net-fix-information-leakage-in-proc-net-ptype.patch +++ b/queue-4.9/net-fix-information-leakage-in-proc-net-ptype.patch @@@ -20,13 -20,15 +20,14 @@@ must be checked when it is not NULL Fixes: 2feb27dbe00c ("[NETNS]: Minor information leak via /proc/net/ptype file.") Signed-off-by: Congyu Liu Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - include/linux/netdevice.h | 1 + - net/core/net-procfs.c | 3 ++- - net/packet/af_packet.c | 2 ++ + include/linux/netdevice.h | 1 + + net/core/net-procfs.c | 3 ++- + net/packet/af_packet.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 2aacafe2bce58..a92fb5c5704f2 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2237,6 +2237,7 @@ struct packet_type { diff --cc queue-4.9/series index 2b2923d5203,ca7df899f18..cebbcf7de86 --- a/queue-4.9/series +++ b/queue-4.9/series @@@ -13,11 -13,11 +13,14 @@@ usb-gadget-f_sourcesink-fix-isoc-transf usb-core-fix-hang-in-usb_kill_urb-by-adding-memory-barriers.patch powerpc-32-fix-boot-failure-with-gcc-latent-entropy-plugin.patch scsi-bnx2fc-flush-destroy_work-queue-before-calling-bnx2fc_interface_put.patch -nfsv4-handle-case-where-the-lookup-of-a-directory-fa.patch -nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non.patch +ipv6_tunnel-rate-limit-warning-messages.patch +arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabled.patch net-fix-information-leakage-in-proc-net-ptype.patch -hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +ipv4-avoid-using-shared-ip-generator-for-connected-sockets.patch +nfsv4-handle-case-where-the-lookup-of-a-directory-fails.patch +nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non-regular-file.patch +net-procfs-show-net-devices-bound-packet-types.patch drm-msm-fix-wrong-size-calculation.patch ++hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch + ipv4-raw-lock-the-socket-in-raw_bind.patch + ipv4-tcp-send-zero-ipid-in-synack-messages.patch -ipv4-avoid-using-shared-ip-generator-for-connected-s.patch diff --cc queue-5.10/drm-msm-fix-wrong-size-calculation.patch index 3c2d9c83a89,5fe28199867..e834744080f --- a/queue-5.10/drm-msm-fix-wrong-size-calculation.patch +++ b/queue-5.10/drm-msm-fix-wrong-size-calculation.patch @@@ -23,14 -23,16 +23,15 @@@ Fixes: 072f1f9168ed ("drm/msm: add supp Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com Signed-off-by: Dmitry Baryshkov +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c -index 33e42b2f9cfcb..e37e5afc680a2 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c -@@ -350,7 +350,7 @@ static int msm_init_vram(struct drm_device *dev) +@@ -350,7 +350,7 @@ static int msm_init_vram(struct drm_devi of_node_put(node); if (ret) return ret; diff --cc queue-5.10/hwmon-lm90-mark-alert-as-broken-for-max6680.patch index fa54d7e3898,eee19815482..62bd1719327 --- a/queue-5.10/hwmon-lm90-mark-alert-as-broken-for-max6680.patch +++ b/queue-5.10/hwmon-lm90-mark-alert-as-broken-for-max6680.patch @@@ -13,14 -13,16 +13,15 @@@ Mark it accordingly Fixes: 4667bcb8d8fc ("hwmon: (lm90) Introduce chip parameter structure") Signed-off-by: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 6841d0401bbd4..54140340c54aa 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -419,7 +419,7 @@ static const struct lm90_params lm90_params[] = { +@@ -418,7 +418,7 @@ static const struct lm90_params lm90_par }, [max6680] = { .flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT diff --cc queue-5.10/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch index 4615ab4deed,cc700308f33..485eefb0a34 --- a/queue-5.10/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +++ b/queue-5.10/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch @@@ -1,5 -1,5 +1,5 @@@ - From a66c5ed539277b9f2363bbace0dba88b85b36c26 Mon Sep 17 00:00:00 2001 - From: Guenter Roeck -From 8049e59c619ddc9ce9228d19ce102708a6e00f8c Mon Sep 17 00:00:00 2001 ++From ea27de255a5a5694bbb94e10547cac19f6bfe21f Mon Sep 17 00:00:00 2001 + From: Sasha Levin Date: Thu, 6 Jan 2022 11:48:52 -0800 Subject: hwmon: (lm90) Reduce maximum conversion rate for G781 @@@ -21,14 -21,16 +21,14 @@@ the problem Fixes: ae544f64cc7b ("hwmon: (lm90) Add support for GMT G781") Signed-off-by: Guenter Roeck - Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 959446b0137bc..fef02bcfedbcf 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -373,7 +373,7 @@ static const struct lm90_params lm90_params[] = { +@@ -373,7 +373,7 @@ static const struct lm90_params lm90_par .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_CRIT, .alert_alarms = 0x7c, diff --cc queue-5.10/ipv6_tunnel-rate-limit-warning-messages.patch index 45e16c010ad,c8db4975c3a..c9f446dfb8a --- a/queue-5.10/ipv6_tunnel-rate-limit-warning-messages.patch +++ b/queue-5.10/ipv6_tunnel-rate-limit-warning-messages.patch @@@ -18,11 -18,13 +18,12 @@@ Tested-by: Maksym Yaremchuk Reviewed-by: Amit Cohen Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv6/ip6_tunnel.c | 8 ++++---- + net/ipv6/ip6_tunnel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c -index 08441f06afd48..3a2741569b847 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1066,14 +1066,14 @@ int ip6_tnl_xmit_ctl(struct ip6_tnl *t, diff --cc queue-5.10/mm-kasan-use-compare-exchange-operation-to-set-kasan-page-tag.patch index 5dd896e29a3,5dd896e29a3..00000000000 deleted file mode 100644,100644 --- a/queue-5.10/mm-kasan-use-compare-exchange-operation-to-set-kasan-page-tag.patch +++ /dev/null @@@ -1,61 -1,61 +1,0 @@@ --From 27fe73394a1c6d0b07fa4d95f1bca116d1cc66e9 Mon Sep 17 00:00:00 2001 --From: Peter Collingbourne --Date: Sat, 29 Jan 2022 13:41:14 -0800 --Subject: mm, kasan: use compare-exchange operation to set KASAN page tag -- --From: Peter Collingbourne -- --commit 27fe73394a1c6d0b07fa4d95f1bca116d1cc66e9 upstream. -- --It has been reported that the tag setting operation on newly-allocated --pages can cause the page flags to be corrupted when performed --concurrently with other flag updates as a result of the use of --non-atomic operations. -- --Fix the problem by using a compare-exchange loop to update the tag. -- --Link: https://lkml.kernel.org/r/20220120020148.1632253-1-pcc@google.com --Link: https://linux-review.googlesource.com/id/I456b24a2b9067d93968d43b4bb3351c0cec63101 --Fixes: 2813b9c02962 ("kasan, mm, arm64: tag non slab memory allocated via pagealloc") --Signed-off-by: Peter Collingbourne --Reviewed-by: Andrey Konovalov --Cc: Peter Zijlstra --Cc: --Signed-off-by: Andrew Morton --Signed-off-by: Linus Torvalds --Signed-off-by: Greg Kroah-Hartman ----- -- include/linux/mm.h | 17 ++++++++++++----- -- 1 file changed, 12 insertions(+), 5 deletions(-) -- --diff --git a/include/linux/mm.h b/include/linux/mm.h --index e1a84b1e6787..213cc569b192 100644 ----- a/include/linux/mm.h --+++ b/include/linux/mm.h --@@ -1506,11 +1506,18 @@ static inline u8 page_kasan_tag(const struct page *page) -- -- static inline void page_kasan_tag_set(struct page *page, u8 tag) -- { --- if (kasan_enabled()) { --- tag ^= 0xff; --- page->flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT); --- page->flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT; --- } --+ unsigned long old_flags, flags; --+ --+ if (!kasan_enabled()) --+ return; --+ --+ tag ^= 0xff; --+ old_flags = READ_ONCE(page->flags); --+ do { --+ flags = old_flags; --+ flags &= ~(KASAN_TAG_MASK << KASAN_TAG_PGSHIFT); --+ flags |= (tag & KASAN_TAG_MASK) << KASAN_TAG_PGSHIFT; --+ } while (unlikely(!try_cmpxchg(&page->flags, &old_flags, flags))); -- } -- -- static inline void page_kasan_tag_reset(struct page *page) ---- --2.35.1 -- diff --cc queue-5.10/net-fix-information-leakage-in-proc-net-ptype.patch index edc698b2744,610e5083574..0710d40c165 --- a/queue-5.10/net-fix-information-leakage-in-proc-net-ptype.patch +++ b/queue-5.10/net-fix-information-leakage-in-proc-net-ptype.patch @@@ -20,13 -20,15 +20,14 @@@ must be checked when it is not NULL Fixes: 2feb27dbe00c ("[NETNS]: Minor information leak via /proc/net/ptype file.") Signed-off-by: Congyu Liu Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - include/linux/netdevice.h | 1 + - net/core/net-procfs.c | 3 ++- - net/packet/af_packet.c | 2 ++ + include/linux/netdevice.h | 1 + + net/core/net-procfs.c | 3 ++- + net/packet/af_packet.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 3476d20b75d49..fe3155736d635 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2543,6 +2543,7 @@ struct packet_type { diff --cc queue-5.10/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch index 00000000000,d5a7dda9f47..9050eb8832b mode 000000,100644..100644 --- a/queue-5.10/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch +++ b/queue-5.10/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch @@@ -1,0 -1,37 +1,32 @@@ + From 2de4529eb45d4d8e0296cc1a5f789b38aeecab7b Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:15 -0500 + Subject: NFS: Ensure the server has an up to date ctime before hardlinking + + From: Trond Myklebust + + [ Upstream commit 204975036b34f55237bc44c8a302a88468ef21b5 ] + + Creating a hard link is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: 9f7682728728 ("NFS: Move the delegation return down into nfs4_proc_link()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index 8b963c72dd3b1..3db80236020f9 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2174,6 +2174,8 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) ++@@ -2192,6 +2192,8 @@ nfs_link(struct dentry *old_dentry, stru + + trace_nfs_link_enter(inode, dir, dentry); + d_drop(dentry); + + if (S_ISREG(inode->i_mode)) + + nfs_sync_inode(inode); + error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name); + if (error == 0) { + ihold(inode); --- -2.34.1 - diff --cc queue-5.10/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-5401 index 00000000000,7925841aba3..c6bb6aa633c mode 000000,100644..100644 --- a/queue-5.10/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-5401 +++ b/queue-5.10/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-5401 @@@ -1,0 -1,37 +1,32 @@@ + From 5446732b2c7ca0840170fda94996b0d48b438aba Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:16 -0500 + Subject: NFS: Ensure the server has an up to date ctime before renaming + + From: Trond Myklebust + + [ Upstream commit 6ff9d99bb88faebf134ca668842349d9718e5464 ] + + Renaming a file is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: f2c2c552f119 ("NFS: Move delegation recall into the NFSv4 callback for rename_setup()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index 3db80236020f9..7d7fab95b74bb 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2264,6 +2264,8 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, ++@@ -2282,6 +2282,8 @@ int nfs_rename(struct inode *old_dir, st + } + } + + + if (S_ISREG(old_inode->i_mode)) + + nfs_sync_inode(old_inode); + task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL); + if (IS_ERR(task)) { + error = PTR_ERR(task); --- -2.34.1 - diff --cc queue-5.10/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch index 2e2b63d816d,79055a8dcd6..31aaece6f15 --- a/queue-5.10/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +++ b/queue-5.10/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch @@@ -27,14 -27,16 +27,15 @@@ Fixes: c319b4d76b9e ("net: ipv4: add IP Reported-by: Hangbin Liu Signed-off-by: Xin Long Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv4/ping.c | 3 ++- + net/ipv4/ping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c -index 8ce8b7300b9d3..a5722905456c2 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c -@@ -220,7 +220,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) +@@ -220,7 +220,8 @@ static struct sock *ping_lookup(struct n continue; } diff --cc queue-5.10/series index 618f7c2f2fe,2f9c7fb7d8b..bf4a0101089 --- a/queue-5.10/series +++ b/queue-5.10/series @@@ -48,18 -48,50 +48,49 @@@ usb-roles-fix-include-linux-usb-role.h- rpmsg-char-fix-race-between-the-release-of-rpmsg_ctrldev-and-cdev.patch rpmsg-char-fix-race-between-the-release-of-rpmsg_eptdev-and-cdev.patch scsi-bnx2fc-flush-destroy_work-queue-before-calling-bnx2fc_interface_put.patch +ipv6_tunnel-rate-limit-warning-messages.patch +arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabled.patch +net-fix-information-leakage-in-proc-net-ptype.patch +hwmon-lm90-mark-alert-as-broken-for-max6646-6647-6649.patch +hwmon-lm90-mark-alert-as-broken-for-max6680.patch +ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +ipv4-avoid-using-shared-ip-generator-for-connected-sockets.patch +hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +nfsv4-handle-case-where-the-lookup-of-a-directory-fails.patch +nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non-regular-file.patch +net-procfs-show-net-devices-bound-packet-types.patch +drm-msm-fix-wrong-size-calculation.patch +drm-msm-dsi-fix-missing-put_device-call-in-dsi_get_phy.patch +drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_enable.patch +ipv6-annotate-accesses-to-fn-fn_sernum.patch + nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch + nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-5401 -nfsv4-handle-case-where-the-lookup-of-a-directory-fa.patch -nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non.patch + powerpc64-bpf-limit-ldbrx-to-processors-compliant-wi.patch + netfilter-conntrack-don-t-increment-invalid-counter-.patch + kernel-delete-repeated-words-in-comments.patch + perf-fix-perf_event_read_local-time.patch + sched-pelt-relax-the-sync-of-util_sum-with-util_avg.patch -arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabl.patch -net-fix-information-leakage-in-proc-net-ptype.patch + net-phy-broadcom-hook-up-soft_reset-for-bcm54616s.patch -ipv6_tunnel-rate-limit-warning-messages.patch + phylib-fix-potential-use-after-free.patch -ipv6-correct-comments-about-fib6_node-sernum.patch -ipv6-annotate-accesses-to-fn-fn_sernum.patch + octeontx2-pf-forward-error-codes-to-vf.patch + rxrpc-adjust-retransmission-backoff.patch + efi-libstub-arm64-fix-image-check-alignment-at-entry.patch -hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch + hwmon-lm90-mark-alert-as-broken-for-max6654.patch -hwmon-lm90-mark-alert-as-broken-for-max6680.patch -hwmon-lm90-mark-alert-as-broken-for-max6646-6647-664.patch + powerpc-perf-fix-power_pmu_disable-to-call-clear_pmi.patch -net-procfs-show-net-devices-bound-packet-types.patch + net-ipv4-move-ip_options_fragment-out-of-loop.patch + net-ipv4-fix-the-warning-for-dereference.patch + ipv4-fix-ip-option-filtering-for-locally-generated-f.patch + ibmvnic-init-running_cap_crqs-early.patch + ibmvnic-don-t-spin-in-tasklet.patch -ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch + video-hyperv_fb-fix-validation-of-screen-resolution.patch -drm-msm-dsi-fix-missing-put_device-call-in-dsi_get_p.patch + drm-msm-hdmi-fix-missing-put_device-call-in-msm_hdmi.patch + drm-msm-dpu-invalid-parameter-check-in-dpu_setup_dsp.patch -drm-msm-fix-wrong-size-calculation.patch -drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_e.patch + yam-fix-a-memory-leak-in-yam_siocdevprivate.patch + net-cpsw-properly-initialise-struct-page_pool_params.patch + net-hns3-handle-empty-unknown-interrupt-for-vf.patch + revert-ipv6-honor-all-ipv6-pio-valid-lifetime-values.patch + net-bridge-vlan-fix-single-net-device-option-dumping.patch + ipv4-raw-lock-the-socket-in-raw_bind.patch + ipv4-tcp-send-zero-ipid-in-synack-messages.patch -ipv4-avoid-using-shared-ip-generator-for-connected-s.patch + ipv4-remove-sparse-error-in-ip_neigh_gw4.patch + net-bridge-vlan-fix-memory-leak-in-__allowed_ingress.patch diff --cc queue-5.15/drm-msm-fix-wrong-size-calculation.patch index 3016ab8cb66,d8333956c87..132f2c55101 --- a/queue-5.15/drm-msm-fix-wrong-size-calculation.patch +++ b/queue-5.15/drm-msm-fix-wrong-size-calculation.patch @@@ -23,14 -23,16 +23,15 @@@ Fixes: 072f1f9168ed ("drm/msm: add supp Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com Signed-off-by: Dmitry Baryshkov +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c -index 27f737a253c77..bbf999c665174 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c -@@ -437,7 +437,7 @@ static int msm_init_vram(struct drm_device *dev) +@@ -437,7 +437,7 @@ static int msm_init_vram(struct drm_devi of_node_put(node); if (ret) return ret; diff --cc queue-5.15/hwmon-lm90-mark-alert-as-broken-for-max6680.patch index fa54d7e3898,ec07c76c64c..62bd1719327 --- a/queue-5.15/hwmon-lm90-mark-alert-as-broken-for-max6680.patch +++ b/queue-5.15/hwmon-lm90-mark-alert-as-broken-for-max6680.patch @@@ -13,14 -13,16 +13,15 @@@ Mark it accordingly Fixes: 4667bcb8d8fc ("hwmon: (lm90) Introduce chip parameter structure") Signed-off-by: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 280ae5f58187b..06cb971c889b4 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -419,7 +419,7 @@ static const struct lm90_params lm90_params[] = { +@@ -418,7 +418,7 @@ static const struct lm90_params lm90_par }, [max6680] = { .flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT diff --cc queue-5.15/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch index 4615ab4deed,5b5b1863e2c..485eefb0a34 --- a/queue-5.15/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +++ b/queue-5.15/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch @@@ -1,5 -1,5 +1,5 @@@ - From a66c5ed539277b9f2363bbace0dba88b85b36c26 Mon Sep 17 00:00:00 2001 - From: Guenter Roeck -From 14ed037fb63f8d9992e58f55b8c9dfad50834a15 Mon Sep 17 00:00:00 2001 ++From ea27de255a5a5694bbb94e10547cac19f6bfe21f Mon Sep 17 00:00:00 2001 + From: Sasha Levin Date: Thu, 6 Jan 2022 11:48:52 -0800 Subject: hwmon: (lm90) Reduce maximum conversion rate for G781 @@@ -21,14 -21,16 +21,14 @@@ the problem Fixes: ae544f64cc7b ("hwmon: (lm90) Add support for GMT G781") Signed-off-by: Guenter Roeck - Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 74019dff2550e..cc5e48fe304b1 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -373,7 +373,7 @@ static const struct lm90_params lm90_params[] = { +@@ -373,7 +373,7 @@ static const struct lm90_params lm90_par .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_CRIT, .alert_alarms = 0x7c, diff --cc queue-5.15/ipv6_tunnel-rate-limit-warning-messages.patch index bd0326bcd6f,83652c2e49e..cb2cad1a5e3 --- a/queue-5.15/ipv6_tunnel-rate-limit-warning-messages.patch +++ b/queue-5.15/ipv6_tunnel-rate-limit-warning-messages.patch @@@ -18,11 -18,13 +18,12 @@@ Tested-by: Maksym Yaremchuk Reviewed-by: Amit Cohen Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv6/ip6_tunnel.c | 8 ++++---- + net/ipv6/ip6_tunnel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c -index 20a67efda47f5..fa8da8ff35b42 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1036,14 +1036,14 @@ int ip6_tnl_xmit_ctl(struct ip6_tnl *t, diff --cc queue-5.15/net-fix-information-leakage-in-proc-net-ptype.patch index c10236e7e2a,21968b1e43f..6fea4e1c2a4 --- a/queue-5.15/net-fix-information-leakage-in-proc-net-ptype.patch +++ b/queue-5.15/net-fix-information-leakage-in-proc-net-ptype.patch @@@ -20,13 -20,15 +20,14 @@@ must be checked when it is not NULL Fixes: 2feb27dbe00c ("[NETNS]: Minor information leak via /proc/net/ptype file.") Signed-off-by: Congyu Liu Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - include/linux/netdevice.h | 1 + - net/core/net-procfs.c | 3 ++- - net/packet/af_packet.c | 2 ++ + include/linux/netdevice.h | 1 + + net/core/net-procfs.c | 3 ++- + net/packet/af_packet.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index ce81cc96a98d9..fba54624191a2 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2636,6 +2636,7 @@ struct packet_type { diff --cc queue-5.15/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch index 00000000000,b72fc657e89..d3a309a3057 mode 000000,100644..100644 --- a/queue-5.15/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch +++ b/queue-5.15/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch @@@ -1,0 -1,37 +1,32 @@@ + From 819a1638d01ceef0d04387333898e7e819560df2 Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:15 -0500 + Subject: NFS: Ensure the server has an up to date ctime before hardlinking + + From: Trond Myklebust + + [ Upstream commit 204975036b34f55237bc44c8a302a88468ef21b5 ] + + Creating a hard link is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: 9f7682728728 ("NFS: Move the delegation return down into nfs4_proc_link()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index 5b68c44848caf..fdea6ff824cf8 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2382,6 +2382,8 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) ++@@ -2400,6 +2400,8 @@ nfs_link(struct dentry *old_dentry, stru + + trace_nfs_link_enter(inode, dir, dentry); + d_drop(dentry); + + if (S_ISREG(inode->i_mode)) + + nfs_sync_inode(inode); + error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name); + if (error == 0) { + ihold(inode); --- -2.34.1 - diff --cc queue-5.15/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-14723 index 00000000000,e5800304f40..19ddcf94ac5 mode 000000,100644..100644 --- a/queue-5.15/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-14723 +++ b/queue-5.15/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-14723 @@@ -1,0 -1,37 +1,32 @@@ + From f255aff22cfe3d57206c276db792e6b8c7619b60 Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:16 -0500 + Subject: NFS: Ensure the server has an up to date ctime before renaming + + From: Trond Myklebust + + [ Upstream commit 6ff9d99bb88faebf134ca668842349d9718e5464 ] + + Renaming a file is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: f2c2c552f119 ("NFS: Move delegation recall into the NFSv4 callback for rename_setup()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index fdea6ff824cf8..ac0e1ab1b71ba 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2472,6 +2472,8 @@ int nfs_rename(struct user_namespace *mnt_userns, struct inode *old_dir, ++@@ -2490,6 +2490,8 @@ int nfs_rename(struct user_namespace *mn + } + } + + + if (S_ISREG(old_inode->i_mode)) + + nfs_sync_inode(old_inode); + task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL); + if (IS_ERR(task)) { + error = PTR_ERR(task); --- -2.34.1 - diff --cc queue-5.15/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch index 2e2b63d816d,64fa7d10da2..31aaece6f15 --- a/queue-5.15/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +++ b/queue-5.15/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch @@@ -27,14 -27,16 +27,15 @@@ Fixes: c319b4d76b9e ("net: ipv4: add IP Reported-by: Hangbin Liu Signed-off-by: Xin Long Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv4/ping.c | 3 ++- + net/ipv4/ping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c -index 1e44a43acfe2d..086822cb1cc96 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c -@@ -220,7 +220,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) +@@ -220,7 +220,8 @@ static struct sock *ping_lookup(struct n continue; } diff --cc queue-5.15/series index 17fd95114b7,ec27c98b766..69fba433e67 --- a/queue-5.15/series +++ b/queue-5.15/series @@@ -1,4 -1,4 +1,3 @@@ --bluetooth-refactor-malicious-adv-data-check.patch can-m_can-m_can_fifo_-read-write-don-t-read-or-write-from-to-fifo-if-length-is-0.patch net-sfp-ignore-disabled-sfp-node.patch net-stmmac-configure-ptp-clock-source-prior-to-ptp-initialization.patch @@@ -83,18 -83,79 +82,80 @@@ rpmsg-char-fix-race-between-the-release rpmsg-char-fix-race-between-the-release-of-rpmsg_eptdev-and-cdev.patch scsi-elx-efct-don-t-use-gfp_kernel-under-spin-lock.patch scsi-bnx2fc-flush-destroy_work-queue-before-calling-bnx2fc_interface_put.patch +ipv6_tunnel-rate-limit-warning-messages.patch +arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabled.patch +net-fix-information-leakage-in-proc-net-ptype.patch +hwmon-lm90-mark-alert-as-broken-for-max6646-6647-6649.patch +hwmon-lm90-mark-alert-as-broken-for-max6680.patch +ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +ipv4-avoid-using-shared-ip-generator-for-connected-sockets.patch +hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +nfsv4-handle-case-where-the-lookup-of-a-directory-fails.patch +nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non-regular-file.patch +net-procfs-show-net-devices-bound-packet-types.patch +drm-msm-fix-wrong-size-calculation.patch +drm-msm-dsi-fix-missing-put_device-call-in-dsi_get_phy.patch +drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_enable.patch +ipv6-annotate-accesses-to-fn-fn_sernum.patch + nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch + nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-14723 -nfsv4-handle-case-where-the-lookup-of-a-directory-fa.patch -nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non.patch + kvm-arm64-pkvm-use-the-mm_ops-indirection-for-cache-.patch + sunrpc-use-bit-macro-in-rpc_show_xprt_state.patch + sunrpc-don-t-dereference-xprt-snd_task-if-it-s-a-coo.patch + powerpc64-bpf-limit-ldbrx-to-processors-compliant-wi.patch + netfilter-conntrack-don-t-increment-invalid-counter-.patch + powerpc-64s-mask-srr0-before-checking-against-the-ma.patch + perf-fix-perf_event_read_local-time.patch + sched-pelt-relax-the-sync-of-util_sum-with-util_avg.patch -arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabl.patch -net-fix-information-leakage-in-proc-net-ptype.patch + net-phy-broadcom-hook-up-soft_reset-for-bcm54616s.patch -ipv6_tunnel-rate-limit-warning-messages.patch + net-stmmac-dwmac-visconti-fix-bit-definitions-for-et.patch + net-stmmac-dwmac-visconti-fix-clock-configuration-fo.patch + phylib-fix-potential-use-after-free.patch -ipv6-annotate-accesses-to-fn-fn_sernum.patch + mptcp-allow-changing-the-backup-bit-by-endpoint-id.patch + mptcp-clean-up-harmless-false-expressions.patch + mptcp-keep-track-of-local-endpoint-still-available-f.patch + mptcp-fix-msk-traversal-in-mptcp_nl_cmd_set_flags.patch + mptcp-fix-removing-ids-bitmap-setting.patch + selftests-mptcp-fix-ipv6-routing-setup.patch + octeontx2-af-do-not-fixup-all-vf-action-entries.patch + octeontx2-af-fix-lbk-backpressure-id-count.patch + octeontx2-af-retry-until-rvu-block-reset-complete.patch + octeontx2-pf-cn10k-ensure-valid-pointers-are-freed-t.patch + octeontx2-af-verify-cq-context-updates.patch + octeontx2-af-increase-link-credit-restore-polling-ti.patch + octeontx2-af-cn10k-do-not-enable-rpm-loopback-for-lp.patch + octeontx2-pf-forward-error-codes-to-vf.patch + rxrpc-adjust-retransmission-backoff.patch + efi-libstub-arm64-fix-image-check-alignment-at-entry.patch + io_uring-fix-bug-in-slow-unregistering-of-nodes.patch + drivers-hv-balloon-account-for-vmbus-packet-header-i.patch -hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch + hwmon-lm90-re-enable-interrupts-after-alert-clears.patch + hwmon-lm90-mark-alert-as-broken-for-max6654.patch -hwmon-lm90-mark-alert-as-broken-for-max6680.patch -hwmon-lm90-mark-alert-as-broken-for-max6646-6647-664.patch + hwmon-lm90-fix-sysfs-and-udev-notifications.patch + hwmon-adt7470-prevent-divide-by-zero-in-adt7470_fan_.patch + powerpc-perf-fix-power_pmu_disable-to-call-clear_pmi.patch -net-procfs-show-net-devices-bound-packet-types.patch + ipv4-fix-ip-option-filtering-for-locally-generated-f.patch + ibmvnic-allow-extra-failures-before-disabling.patch + ibmvnic-init-running_cap_crqs-early.patch + ibmvnic-don-t-spin-in-tasklet.patch + net-smc-transitional-solution-for-clcsock-race-issue.patch -ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch + video-hyperv_fb-fix-validation-of-screen-resolution.patch + can-tcan4x5x-regmap-fix-max-register-value.patch -drm-msm-dsi-fix-missing-put_device-call-in-dsi_get_p.patch + drm-msm-hdmi-fix-missing-put_device-call-in-msm_hdmi.patch + drm-msm-dpu-invalid-parameter-check-in-dpu_setup_dsp.patch -drm-msm-fix-wrong-size-calculation.patch + drm-msm-a6xx-add-missing-suspend_count-increment.patch -drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_e.patch + yam-fix-a-memory-leak-in-yam_siocdevprivate.patch + net-cpsw-properly-initialise-struct-page_pool_params.patch + net-hns3-handle-empty-unknown-interrupt-for-vf.patch + sch_htb-fail-on-unsupported-parameters-when-offload-.patch + revert-drm-ast-support-1600x900-with-108mhz-pclk.patch + kvm-selftests-don-t-skip-l2-s-vmcall-in-smm-test-for.patch + ceph-put-the-requests-sessions-when-it-fails-to-allo.patch + gve-fix-gfp-flags-when-allocing-pages.patch + revert-ipv6-honor-all-ipv6-pio-valid-lifetime-values.patch + net-bridge-vlan-fix-single-net-device-option-dumping.patch + ipv4-raw-lock-the-socket-in-raw_bind.patch + ipv4-tcp-send-zero-ipid-in-synack-messages.patch -ipv4-avoid-using-shared-ip-generator-for-connected-s.patch + ipv4-remove-sparse-error-in-ip_neigh_gw4.patch + net-bridge-vlan-fix-memory-leak-in-__allowed_ingress.patch ++bluetooth-refactor-malicious-adv-data-check.patch diff --cc queue-5.16/drm-msm-fix-wrong-size-calculation.patch index 8de27f7f134,1934cf6fa07..24758287457 --- a/queue-5.16/drm-msm-fix-wrong-size-calculation.patch +++ b/queue-5.16/drm-msm-fix-wrong-size-calculation.patch @@@ -23,14 -23,16 +23,15 @@@ Fixes: 072f1f9168ed ("drm/msm: add supp Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com Signed-off-by: Dmitry Baryshkov +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c -index 892c04365239b..f04a2337da006 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c -@@ -466,7 +466,7 @@ static int msm_init_vram(struct drm_device *dev) +@@ -466,7 +466,7 @@ static int msm_init_vram(struct drm_devi of_node_put(node); if (ret) return ret; diff --cc queue-5.16/hwmon-lm90-mark-alert-as-broken-for-max6680.patch index fa54d7e3898,10ecb5469ce..62bd1719327 --- a/queue-5.16/hwmon-lm90-mark-alert-as-broken-for-max6680.patch +++ b/queue-5.16/hwmon-lm90-mark-alert-as-broken-for-max6680.patch @@@ -13,14 -13,16 +13,15 @@@ Mark it accordingly Fixes: 4667bcb8d8fc ("hwmon: (lm90) Introduce chip parameter structure") Signed-off-by: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 280ae5f58187b..06cb971c889b4 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -419,7 +419,7 @@ static const struct lm90_params lm90_params[] = { +@@ -418,7 +418,7 @@ static const struct lm90_params lm90_par }, [max6680] = { .flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT diff --cc queue-5.16/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch index 4615ab4deed,99519b63a2a..485eefb0a34 --- a/queue-5.16/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +++ b/queue-5.16/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch @@@ -1,5 -1,5 +1,5 @@@ - From a66c5ed539277b9f2363bbace0dba88b85b36c26 Mon Sep 17 00:00:00 2001 - From: Guenter Roeck -From 55cd0c1783606faf34612ccb5e5d4a5ae0daed57 Mon Sep 17 00:00:00 2001 ++From ea27de255a5a5694bbb94e10547cac19f6bfe21f Mon Sep 17 00:00:00 2001 + From: Sasha Levin Date: Thu, 6 Jan 2022 11:48:52 -0800 Subject: hwmon: (lm90) Reduce maximum conversion rate for G781 @@@ -21,14 -21,16 +21,14 @@@ the problem Fixes: ae544f64cc7b ("hwmon: (lm90) Add support for GMT G781") Signed-off-by: Guenter Roeck - Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 74019dff2550e..cc5e48fe304b1 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -373,7 +373,7 @@ static const struct lm90_params lm90_params[] = { +@@ -373,7 +373,7 @@ static const struct lm90_params lm90_par .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_CRIT, .alert_alarms = 0x7c, diff --cc queue-5.16/ipv6_tunnel-rate-limit-warning-messages.patch index bd0326bcd6f,c864ecdbd05..cb2cad1a5e3 --- a/queue-5.16/ipv6_tunnel-rate-limit-warning-messages.patch +++ b/queue-5.16/ipv6_tunnel-rate-limit-warning-messages.patch @@@ -18,11 -18,13 +18,12 @@@ Tested-by: Maksym Yaremchuk Reviewed-by: Amit Cohen Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv6/ip6_tunnel.c | 8 ++++---- + net/ipv6/ip6_tunnel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c -index 484aca492cc06..7c6a0bdb0e1ba 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1036,14 +1036,14 @@ int ip6_tnl_xmit_ctl(struct ip6_tnl *t, diff --cc queue-5.16/net-bridge-vlan-fix-memory-leak-in-__allowed_ingress.patch index 00000000000,e6892ad9d87..bdcccc322a5 mode 000000,100644..100644 --- a/queue-5.16/net-bridge-vlan-fix-memory-leak-in-__allowed_ingress.patch +++ b/queue-5.16/net-bridge-vlan-fix-memory-leak-in-__allowed_ingress.patch @@@ -1,0 -1,47 +1,42 @@@ + From b321b23c9ca3d7a9ebff614041eb07f21d9b7fc9 Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Thu, 27 Jan 2022 15:49:53 +0800 + Subject: net: bridge: vlan: fix memory leak in __allowed_ingress + + From: Tim Yi + + [ Upstream commit fd20d9738395cf8e27d0a17eba34169699fccdff ] + + When using per-vlan state, if vlan snooping and stats are disabled, + untagged or priority-tagged ingress frame will go to check pvid state. + If the port state is forwarding and the pvid state is not + learning/forwarding, untagged or priority-tagged frame will be dropped + but skb memory is not freed. + Should free skb when __allowed_ingress returns false. + + Fixes: a580c76d534c ("net: bridge: vlan: add per-vlan state") + Signed-off-by: Tim Yi + Acked-by: Nikolay Aleksandrov + Link: https://lore.kernel.org/r/20220127074953.12632-1-tim.yi@pica8.com + Signed-off-by: Jakub Kicinski + Signed-off-by: Sasha Levin + --- - net/bridge/br_vlan.c | 6 +++--- ++ net/bridge/br_vlan.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + -diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c -index d0ebcc99bfa9d..f02351b4acaca 100644 + --- a/net/bridge/br_vlan.c + +++ b/net/bridge/br_vlan.c -@@ -560,10 +560,10 @@ static bool __allowed_ingress(const struct net_bridge *br, ++@@ -560,10 +560,10 @@ static bool __allowed_ingress(const stru + !br_opt_get(br, BROPT_VLAN_STATS_ENABLED)) { + if (*state == BR_STATE_FORWARDING) { + *state = br_vlan_get_pvid_state(vg); + - return br_vlan_state_allowed(*state, true); + - } else { + - return true; + + if (!br_vlan_state_allowed(*state, true)) + + goto drop; + } + + return true; + } + } + v = br_vlan_find(vg, *vid); --- -2.34.1 - diff --cc queue-5.16/net-fix-information-leakage-in-proc-net-ptype.patch index 748b891958f,41ca97b12bb..e9ea80db27a --- a/queue-5.16/net-fix-information-leakage-in-proc-net-ptype.patch +++ b/queue-5.16/net-fix-information-leakage-in-proc-net-ptype.patch @@@ -20,13 -20,15 +20,14 @@@ must be checked when it is not NULL Fixes: 2feb27dbe00c ("[NETNS]: Minor information leak via /proc/net/ptype file.") Signed-off-by: Congyu Liu Signed-off-by: David S. Miller + Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - include/linux/netdevice.h | 1 + - net/core/net-procfs.c | 3 ++- - net/packet/af_packet.c | 2 ++ + include/linux/netdevice.h | 1 + + net/core/net-procfs.c | 3 ++- + net/packet/af_packet.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 6aadcc0ecb5b0..6cbefb660fa3b 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2636,6 +2636,7 @@ struct packet_type { diff --cc queue-5.16/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch index 00000000000,1d59f2bf6ed..aa4752a10b3 mode 000000,100644..100644 --- a/queue-5.16/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch +++ b/queue-5.16/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch @@@ -1,0 -1,37 +1,32 @@@ + From 7401c3e344a9d4e02520f6417cefe206d5e48b9b Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:15 -0500 + Subject: NFS: Ensure the server has an up to date ctime before hardlinking + + From: Trond Myklebust + + [ Upstream commit 204975036b34f55237bc44c8a302a88468ef21b5 ] + + Creating a hard link is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: 9f7682728728 ("NFS: Move the delegation return down into nfs4_proc_link()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index 731d31015b6aa..4c4fdb208c7ba 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2379,6 +2379,8 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) ++@@ -2397,6 +2397,8 @@ nfs_link(struct dentry *old_dentry, stru + + trace_nfs_link_enter(inode, dir, dentry); + d_drop(dentry); + + if (S_ISREG(inode->i_mode)) + + nfs_sync_inode(inode); + error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name); + if (error == 0) { + nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); --- -2.34.1 - diff --cc queue-5.16/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-28172 index 00000000000,72b2e0fb3a5..9b4362238f4 mode 000000,100644..100644 --- a/queue-5.16/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-28172 +++ b/queue-5.16/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-28172 @@@ -1,0 -1,37 +1,32 @@@ + From 7f75d3ad94972037e04defd23c385f76288d4920 Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:16 -0500 + Subject: NFS: Ensure the server has an up to date ctime before renaming + + From: Trond Myklebust + + [ Upstream commit 6ff9d99bb88faebf134ca668842349d9718e5464 ] + + Renaming a file is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: f2c2c552f119 ("NFS: Move delegation recall into the NFSv4 callback for rename_setup()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index 4c4fdb208c7ba..27f0ad4817491 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2470,6 +2470,8 @@ int nfs_rename(struct user_namespace *mnt_userns, struct inode *old_dir, ++@@ -2488,6 +2488,8 @@ int nfs_rename(struct user_namespace *mn + } + } + + + if (S_ISREG(old_inode->i_mode)) + + nfs_sync_inode(old_inode); + task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL); + if (IS_ERR(task)) { + error = PTR_ERR(task); --- -2.34.1 - diff --cc queue-5.16/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch index 2e2b63d816d,28544745541..31aaece6f15 --- a/queue-5.16/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +++ b/queue-5.16/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch @@@ -27,14 -27,16 +27,15 @@@ Fixes: c319b4d76b9e ("net: ipv4: add IP Reported-by: Hangbin Liu Signed-off-by: Xin Long Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv4/ping.c | 3 ++- + net/ipv4/ping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c -index 1e44a43acfe2d..086822cb1cc96 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c -@@ -220,7 +220,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) +@@ -220,7 +220,8 @@ static struct sock *ping_lookup(struct n continue; } diff --cc queue-5.16/series index 93e36dc9740,014a3f97566..1715bd62849 --- a/queue-5.16/series +++ b/queue-5.16/series @@@ -103,18 -103,84 +103,84 @@@ rpmsg-char-fix-race-between-the-release rpmsg-char-fix-race-between-the-release-of-rpmsg_eptdev-and-cdev.patch scsi-elx-efct-don-t-use-gfp_kernel-under-spin-lock.patch scsi-bnx2fc-flush-destroy_work-queue-before-calling-bnx2fc_interface_put.patch +ipv6_tunnel-rate-limit-warning-messages.patch +arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabled.patch +net-fix-information-leakage-in-proc-net-ptype.patch +hwmon-lm90-mark-alert-as-broken-for-max6646-6647-6649.patch +hwmon-lm90-mark-alert-as-broken-for-max6680.patch +ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +ipv4-avoid-using-shared-ip-generator-for-connected-sockets.patch +hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +nfsv4-handle-case-where-the-lookup-of-a-directory-fails.patch +nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non-regular-file.patch +net-procfs-show-net-devices-bound-packet-types.patch +drm-msm-fix-wrong-size-calculation.patch +drm-msm-dsi-fix-missing-put_device-call-in-dsi_get_phy.patch +drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_enable.patch +ipv6-annotate-accesses-to-fn-fn_sernum.patch + nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch + nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-28172 -nfsv4-handle-case-where-the-lookup-of-a-directory-fa.patch -nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non.patch + kvm-arm64-pkvm-use-the-mm_ops-indirection-for-cache-.patch + sunrpc-don-t-dereference-xprt-snd_task-if-it-s-a-coo.patch + powerpc64-bpf-limit-ldbrx-to-processors-compliant-wi.patch + netfilter-conntrack-don-t-increment-invalid-counter-.patch + remoteproc-qcom-q6v5-fix-service-routines-build-erro.patch + powerpc-64s-mask-srr0-before-checking-against-the-ma.patch + perf-fix-perf_event_read_local-time.patch + sched-pelt-relax-the-sync-of-util_sum-with-util_avg.patch -arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabl.patch -net-fix-information-leakage-in-proc-net-ptype.patch + net-phy-broadcom-hook-up-soft_reset-for-bcm54616s.patch + ethtool-fix-link-extended-state-for-big-endian.patch -ipv6_tunnel-rate-limit-warning-messages.patch + net-stmmac-dwmac-visconti-fix-bit-definitions-for-et.patch + net-stmmac-dwmac-visconti-fix-clock-configuration-fo.patch + phylib-fix-potential-use-after-free.patch -ipv6-annotate-accesses-to-fn-fn_sernum.patch + mptcp-allow-changing-the-backup-bit-by-endpoint-id.patch + mptcp-clean-up-harmless-false-expressions.patch + mptcp-keep-track-of-local-endpoint-still-available-f.patch + mptcp-fix-msk-traversal-in-mptcp_nl_cmd_set_flags.patch + mptcp-fix-removing-ids-bitmap-setting.patch + selftests-mptcp-fix-ipv6-routing-setup.patch + octeontx2-af-do-not-fixup-all-vf-action-entries.patch + octeontx2-af-fix-lbk-backpressure-id-count.patch + octeontx2-af-retry-until-rvu-block-reset-complete.patch + octeontx2-af-cn10k-use-appropriate-register-for-lmac.patch + octeontx2-pf-cn10k-ensure-valid-pointers-are-freed-t.patch + octeontx2-af-increase-link-credit-restore-polling-ti.patch + octeontx2-af-cn10k-do-not-enable-rpm-loopback-for-lp.patch + octeontx2-pf-forward-error-codes-to-vf.patch + octeontx2-af-add-kpu-changes-to-parse-ngio-as-separa.patch + rxrpc-adjust-retransmission-backoff.patch + efi-libstub-arm64-fix-image-check-alignment-at-entry.patch + io_uring-fix-bug-in-slow-unregistering-of-nodes.patch + block-fix-memory-leak-in-disk_register_independent_a.patch + drivers-hv-balloon-account-for-vmbus-packet-header-i.patch -hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch + hwmon-lm90-re-enable-interrupts-after-alert-clears.patch + hwmon-lm90-mark-alert-as-broken-for-max6654.patch -hwmon-lm90-mark-alert-as-broken-for-max6680.patch -hwmon-lm90-mark-alert-as-broken-for-max6646-6647-664.patch + hwmon-lm90-fix-sysfs-and-udev-notifications.patch + hwmon-adt7470-prevent-divide-by-zero-in-adt7470_fan_.patch + powerpc-perf-fix-power_pmu_disable-to-call-clear_pmi.patch -net-procfs-show-net-devices-bound-packet-types.patch + ipv4-fix-ip-option-filtering-for-locally-generated-f.patch + ibmvnic-allow-extra-failures-before-disabling.patch + ibmvnic-init-running_cap_crqs-early.patch + ibmvnic-don-t-spin-in-tasklet.patch + net-smc-transitional-solution-for-clcsock-race-issue.patch -ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch + video-hyperv_fb-fix-validation-of-screen-resolution.patch + can-tcan4x5x-regmap-fix-max-register-value.patch + hwmon-nct6775-fix-crash-in-clear_caseopen.patch -drm-msm-dsi-fix-missing-put_device-call-in-dsi_get_p.patch + drm-msm-hdmi-fix-missing-put_device-call-in-msm_hdmi.patch + drm-msm-dpu-invalid-parameter-check-in-dpu_setup_dsp.patch -drm-msm-fix-wrong-size-calculation.patch + drm-msm-a6xx-add-missing-suspend_count-increment.patch -drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_e.patch + yam-fix-a-memory-leak-in-yam_siocdevprivate.patch + net-cpsw-properly-initialise-struct-page_pool_params.patch + net-hns3-handle-empty-unknown-interrupt-for-vf.patch + kvm-selftests-re-enable-access_tracking_perf_test.patch + sch_htb-fail-on-unsupported-parameters-when-offload-.patch + revert-drm-ast-support-1600x900-with-108mhz-pclk.patch + kvm-selftests-don-t-skip-l2-s-vmcall-in-smm-test-for.patch + ceph-put-the-requests-sessions-when-it-fails-to-allo.patch + gve-fix-gfp-flags-when-allocing-pages.patch + revert-ipv6-honor-all-ipv6-pio-valid-lifetime-values.patch + net-bridge-vlan-fix-single-net-device-option-dumping.patch + ipv4-raw-lock-the-socket-in-raw_bind.patch + ipv4-tcp-send-zero-ipid-in-synack-messages.patch -ipv4-avoid-using-shared-ip-generator-for-connected-s.patch + ipv4-remove-sparse-error-in-ip_neigh_gw4.patch + net-bridge-vlan-fix-memory-leak-in-__allowed_ingress.patch diff --cc queue-5.4/drm-msm-fix-wrong-size-calculation.patch index 081a37217e7,7580681d81d..2016ed99557 --- a/queue-5.4/drm-msm-fix-wrong-size-calculation.patch +++ b/queue-5.4/drm-msm-fix-wrong-size-calculation.patch @@@ -23,14 -23,16 +23,15 @@@ Fixes: 072f1f9168ed ("drm/msm: add supp Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com Signed-off-by: Dmitry Baryshkov +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c -index 7443df77cadb5..407b51cf67909 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c -@@ -337,7 +337,7 @@ static int msm_init_vram(struct drm_device *dev) +@@ -337,7 +337,7 @@ static int msm_init_vram(struct drm_devi of_node_put(node); if (ret) return ret; diff --cc queue-5.4/hwmon-lm90-mark-alert-as-broken-for-max6680.patch index fa54d7e3898,07729eeebcf..62bd1719327 --- a/queue-5.4/hwmon-lm90-mark-alert-as-broken-for-max6680.patch +++ b/queue-5.4/hwmon-lm90-mark-alert-as-broken-for-max6680.patch @@@ -13,14 -13,16 +13,15 @@@ Mark it accordingly Fixes: 4667bcb8d8fc ("hwmon: (lm90) Introduce chip parameter structure") Signed-off-by: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 28b408728282d..53364e8d1dbff 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -419,7 +419,7 @@ static const struct lm90_params lm90_params[] = { +@@ -418,7 +418,7 @@ static const struct lm90_params lm90_par }, [max6680] = { .flags = LM90_HAVE_OFFSET | LM90_HAVE_CRIT diff --cc queue-5.4/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch index 4615ab4deed,6d921c12fb8..485eefb0a34 --- a/queue-5.4/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +++ b/queue-5.4/hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch @@@ -1,5 -1,5 +1,5 @@@ - From a66c5ed539277b9f2363bbace0dba88b85b36c26 Mon Sep 17 00:00:00 2001 - From: Guenter Roeck -From 3f92e9e1ed431a073d4c0b1f16179d27b0dab624 Mon Sep 17 00:00:00 2001 ++From ea27de255a5a5694bbb94e10547cac19f6bfe21f Mon Sep 17 00:00:00 2001 + From: Sasha Levin Date: Thu, 6 Jan 2022 11:48:52 -0800 Subject: hwmon: (lm90) Reduce maximum conversion rate for G781 @@@ -21,14 -21,16 +21,14 @@@ the problem Fixes: ae544f64cc7b ("hwmon: (lm90) Add support for GMT G781") Signed-off-by: Guenter Roeck - Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/lm90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c -index 9abb4507f572b..0e3304d1c3f28 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c -@@ -373,7 +373,7 @@ static const struct lm90_params lm90_params[] = { +@@ -373,7 +373,7 @@ static const struct lm90_params lm90_par .flags = LM90_HAVE_OFFSET | LM90_HAVE_REM_LIMIT_EXT | LM90_HAVE_BROKEN_ALERT | LM90_HAVE_CRIT, .alert_alarms = 0x7c, diff --cc queue-5.4/ipv6_tunnel-rate-limit-warning-messages.patch index 8d016fecbbd,6706a086482..1678253c346 --- a/queue-5.4/ipv6_tunnel-rate-limit-warning-messages.patch +++ b/queue-5.4/ipv6_tunnel-rate-limit-warning-messages.patch @@@ -18,11 -18,13 +18,12 @@@ Tested-by: Maksym Yaremchuk Reviewed-by: Amit Cohen Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv6/ip6_tunnel.c | 8 ++++---- + net/ipv6/ip6_tunnel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c -index fd0d1cee2d3f5..878a08c40fffd 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -1000,14 +1000,14 @@ int ip6_tnl_xmit_ctl(struct ip6_tnl *t, diff --cc queue-5.4/net-fix-information-leakage-in-proc-net-ptype.patch index 9bef02a66f6,f321febd391..f0a2335beea --- a/queue-5.4/net-fix-information-leakage-in-proc-net-ptype.patch +++ b/queue-5.4/net-fix-information-leakage-in-proc-net-ptype.patch @@@ -20,13 -20,15 +20,14 @@@ must be checked when it is not NULL Fixes: 2feb27dbe00c ("[NETNS]: Minor information leak via /proc/net/ptype file.") Signed-off-by: Congyu Liu Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - include/linux/netdevice.h | 1 + - net/core/net-procfs.c | 3 ++- - net/packet/af_packet.c | 2 ++ + include/linux/netdevice.h | 1 + + net/core/net-procfs.c | 3 ++- + net/packet/af_packet.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 4860944e936db..288a586782563 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2397,6 +2397,7 @@ struct packet_type { diff --cc queue-5.4/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch index 00000000000,c1070b07071..04d6756e99c mode 000000,100644..100644 --- a/queue-5.4/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch +++ b/queue-5.4/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch @@@ -1,0 -1,37 +1,32 @@@ + From 07fdad97e93af9394000b9aba75d318f8692de8e Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:15 -0500 + Subject: NFS: Ensure the server has an up to date ctime before hardlinking + + From: Trond Myklebust + + [ Upstream commit 204975036b34f55237bc44c8a302a88468ef21b5 ] + + Creating a hard link is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: 9f7682728728 ("NFS: Move the delegation return down into nfs4_proc_link()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index e7c0790308fe0..c02bd12019c89 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2035,6 +2035,8 @@ nfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *dentry) ++@@ -2053,6 +2053,8 @@ nfs_link(struct dentry *old_dentry, stru + + trace_nfs_link_enter(inode, dir, dentry); + d_drop(dentry); + + if (S_ISREG(inode->i_mode)) + + nfs_sync_inode(inode); + error = NFS_PROTO(dir)->link(inode, dir, &dentry->d_name); + if (error == 0) { + ihold(inode); --- -2.34.1 - diff --cc queue-5.4/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-20580 index 00000000000,e7dd250b151..7efc1f840b6 mode 000000,100644..100644 --- a/queue-5.4/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-20580 +++ b/queue-5.4/nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-20580 @@@ -1,0 -1,37 +1,32 @@@ + From e98ffb09229939fed472d24a36e5f355353f48d1 Mon Sep 17 00:00:00 2001 + From: Sasha Levin + Date: Wed, 15 Dec 2021 16:38:16 -0500 + Subject: NFS: Ensure the server has an up to date ctime before renaming + + From: Trond Myklebust + + [ Upstream commit 6ff9d99bb88faebf134ca668842349d9718e5464 ] + + Renaming a file is required by POSIX to update the file ctime, so + ensure that the file data is synced to disk so that we don't clobber the + updated ctime by writing back after creating the hard link. + + Fixes: f2c2c552f119 ("NFS: Move delegation recall into the NFSv4 callback for rename_setup()") + Signed-off-by: Trond Myklebust + Signed-off-by: Anna Schumaker + Signed-off-by: Sasha Levin + --- - fs/nfs/dir.c | 2 ++ ++ fs/nfs/dir.c | 2 ++ + 1 file changed, 2 insertions(+) + -diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c -index c02bd12019c89..1cbc2e50cc6c4 100644 + --- a/fs/nfs/dir.c + +++ b/fs/nfs/dir.c -@@ -2125,6 +2125,8 @@ int nfs_rename(struct inode *old_dir, struct dentry *old_dentry, ++@@ -2143,6 +2143,8 @@ int nfs_rename(struct inode *old_dir, st + } + } + + + if (S_ISREG(old_inode->i_mode)) + + nfs_sync_inode(old_inode); + task = nfs_async_rename(old_dir, new_dir, old_dentry, new_dentry, NULL); + if (IS_ERR(task)) { + error = PTR_ERR(task); --- -2.34.1 - diff --cc queue-5.4/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch index 2e2b63d816d,c61ec180a17..31aaece6f15 --- a/queue-5.4/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +++ b/queue-5.4/ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch @@@ -27,14 -27,16 +27,15 @@@ Fixes: c319b4d76b9e ("net: ipv4: add IP Reported-by: Hangbin Liu Signed-off-by: Xin Long Signed-off-by: David S. Miller +Signed-off-by: Greg Kroah-Hartman + Signed-off-by: Sasha Levin --- - net/ipv4/ping.c | 3 ++- + net/ipv4/ping.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c -index 1c3d5d3702a10..b0f51c7cc0d90 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c -@@ -220,7 +220,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) +@@ -220,7 +220,8 @@ static struct sock *ping_lookup(struct n continue; } diff --cc queue-5.4/series index d5816e3e3de,7245d7e18c9..9b0a7756ade --- a/queue-5.4/series +++ b/queue-5.4/series @@@ -29,18 -29,32 +29,33 @@@ i40e-fix-unsigned-stat-widths.patc rpmsg-char-fix-race-between-the-release-of-rpmsg_ctrldev-and-cdev.patch rpmsg-char-fix-race-between-the-release-of-rpmsg_eptdev-and-cdev.patch scsi-bnx2fc-flush-destroy_work-queue-before-calling-bnx2fc_interface_put.patch +ipv6_tunnel-rate-limit-warning-messages.patch +arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabled.patch +net-fix-information-leakage-in-proc-net-ptype.patch +hwmon-lm90-mark-alert-as-broken-for-max6646-6647-6649.patch +hwmon-lm90-mark-alert-as-broken-for-max6680.patch +ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch +ipv4-avoid-using-shared-ip-generator-for-connected-sockets.patch +hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch +nfsv4-handle-case-where-the-lookup-of-a-directory-fails.patch +nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non-regular-file.patch +net-procfs-show-net-devices-bound-packet-types.patch +drm-msm-fix-wrong-size-calculation.patch +drm-msm-dsi-fix-missing-put_device-call-in-dsi_get_phy.patch +drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_enable.patch +ipv6-annotate-accesses-to-fn-fn_sernum.patch + nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch + nfs-ensure-the-server-has-an-up-to-date-ctime-before.patch-20580 -nfsv4-handle-case-where-the-lookup-of-a-directory-fa.patch -nfsv4-nfs_atomic_open-can-race-when-looking-up-a-non.patch + netfilter-conntrack-don-t-increment-invalid-counter-.patch -arm-9170-1-fix-panic-when-kasan-and-kprobe-are-enabl.patch -net-fix-information-leakage-in-proc-net-ptype.patch + net-phy-broadcom-hook-up-soft_reset-for-bcm54616s.patch -ipv6_tunnel-rate-limit-warning-messages.patch + phylib-fix-potential-use-after-free.patch + rxrpc-adjust-retransmission-backoff.patch -hwmon-lm90-reduce-maximum-conversion-rate-for-g781.patch + hwmon-lm90-mark-alert-as-broken-for-max6654.patch -hwmon-lm90-mark-alert-as-broken-for-max6680.patch -hwmon-lm90-mark-alert-as-broken-for-max6646-6647-664.patch -net-procfs-show-net-devices-bound-packet-types.patch + ibmvnic-init-running_cap_crqs-early.patch + ibmvnic-don-t-spin-in-tasklet.patch -ping-fix-the-sk_bound_dev_if-match-in-ping_lookup.patch -drm-msm-dsi-fix-missing-put_device-call-in-dsi_get_p.patch + drm-msm-hdmi-fix-missing-put_device-call-in-msm_hdmi.patch -drm-msm-fix-wrong-size-calculation.patch -drm-msm-dsi-invalid-parameter-check-in-msm_dsi_phy_e.patch + yam-fix-a-memory-leak-in-yam_siocdevprivate.patch + net-hns3-handle-empty-unknown-interrupt-for-vf.patch + ipv4-raw-lock-the-socket-in-raw_bind.patch + ipv4-tcp-send-zero-ipid-in-synack-messages.patch -ipv4-avoid-using-shared-ip-generator-for-connected-s.patch + ipv4-remove-sparse-error-in-ip_neigh_gw4.patch