4.19.238-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 329/338 mm/sparsemem: fix mem_section will never be NULL gcc 12 warning
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
commit a431dbbc540532b7465eae4fc8b56a85a9fc7d17 upstream.
The gcc 12 compiler reports a "'mem_section' will never be NULL" warning on the following code:
static inline struct mem_section *__nr_to_section(unsigned long nr)
{
#ifdef CONFIG_SPARSEMEM_EXTREME
if (!mem_section)
return NULL;
#endif
if (!mem_section[SECTION_NR_TO_ROOT(nr)])
return NULL;
:It happens with CONFIG_SPARSEMEM_EXTREME off. The mem_section definition is
#ifdef CONFIG_SPARSEMEM_EXTREME
extern struct mem_section **mem_section;
#else
extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
#endifIn the !CONFIG_SPARSEMEM_EXTREME case, mem_section is a static 2-dimensional array and so the check "!mem_section[SECTION_NR_TO_ROOT(nr)]" doesn't make sense.
Fix this warning by moving the "!mem_section[SECTION_NR_TO_ROOT(nr)]" check up inside the CONFIG_SPARSEMEM_EXTREME block and adding an explicit NR_SECTION_ROOTS check to make sure that there is no out-of-bound array access.
--- include/linux/mmzone.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
include/linux/mmzone.h +7 -4
@@ -1155,13 +1155,16 @@ extern struct mem_section mem_section[NRstatic inline struct mem_section *__nr_to_section (unsigned long nr) { +unsigned long root =SECTION_NR_TO_ROOT (nr); + +if (unlikely (root >=NR_SECTION_ROOTS )) +return NULL ; +#ifdef CONFIG_SPARSEMEM_EXTREME -if (!mem_section) +if (!mem_section || !mem_section[root])return NULL ;#endif -if (!mem_section[SECTION_NR_TO_ROOT (nr)]) -return NULL ; -return &mem_section[SECTION_NR_TO_ROOT (nr)][nr &SECTION_ROOT_MASK ]; +return &mem_section[root][nr &SECTION_ROOT_MASK ]; }extern int __section_nr (struct mem_section * ms);extern unsigned long usemap_size (void );
Greg Kroah-Hartman
maintainerPATCH 330/338 cgroup: Use open-time credentials for process migraton perm checks
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit 1756d7994ad85c2479af6ae5a9750b92324685af upstream.
cgroup process migration permission checks are performed at write time as whether a given operation is allowed or not is dependent on the content of the write - the PID. This currently uses current's credentials which is a potential security weakness as it may allow scenarios where a less privileged process tricks a more privileged one into writing into a fd that it created.
This patch makes both cgroup2 and cgroup1 process migration interfaces to use the credentials saved at the time of open (file->f_cred) instead of current's.
[OP: backport to v4.19: apply original __cgroup_procs_write() changes to cgroup_threads_write() and cgroup_procs_write()]
--- kernel/cgroup/cgroup-v1.c | 7 ++++--- kernel/cgroup/cgroup.c | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-)
kernel/cgroup/cgroup-v1.c +4 -3
@@ -535,10 +535,11 @@ static ssize_t __cgroup1_procs_write(str goto out_unlock;/* -* Even if we're attaching all tasks in the thread group, we only -* need to check permissions on one of them. +* Even if we're attaching all tasks in the thread group, we only need +* to check permissions on one of them. Check permissions using the +* credentials from file open to protect against inherited fd attacks. */ - cred =current_cred (); + cred = of->file->f_cred; tcred =get_task_cred (task); if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) && !uid_eq(cred->euid, tcred->uid) &&
kernel/cgroup/cgroup.c +16 -1
@@ -4487,6 +4487,7 @@ static ssize_t cgroup_procs_write(struct {struct cgroup *src_cgrp, *dst_cgrp;struct task_struct *task; +const struct cred *saved_cred;ssize_t ret; dst_cgrp =cgroup_kn_lock_live (of->kn, false);
@@ -4503,8 +4504,15 @@ static ssize_t cgroup_procs_write(struct src_cgrp =task_cgroup_from_root (task, &cgrp_dfl_root);spin_unlock_irq (&css_set_lock); +/* +* Process and thread migrations follow same delegation rule. Check +* permissions using the credentials from file open to protect against +* inherited fd attacks. +*/ + saved_cred =override_creds (of->file->f_cred); ret =cgroup_procs_write_permission (src_cgrp, dst_cgrp, of->file->f_path.dentry->d_sb); +revert_creds (saved_cred);if (ret) goto out_finish;
@@ -4528,6 +4536,7 @@ static ssize_t cgroup_threads_write(stru {struct cgroup *src_cgrp, *dst_cgrp;struct task_struct *task; +const struct cred *saved_cred;ssize_t ret; buf =strstrip (buf);
@@ -4546,9 +4555,15 @@ static ssize_t cgroup_threads_write(stru src_cgrp =task_cgroup_from_root (task, &cgrp_dfl_root);spin_unlock_irq (&css_set_lock); -/* thread migrations follow the cgroup.procs delegation rule */ +/* +* Process and thread migrations follow same delegation rule. Check +* permissions using the credentials from file open to protect against +* inherited fd attacks. +*/ + saved_cred =override_creds (of->file->f_cred); ret =cgroup_procs_write_permission (src_cgrp, dst_cgrp, of->file->f_path.dentry->d_sb); +revert_creds (saved_cred);if (ret) goto out_finish;
Greg Kroah-Hartman
maintainerPATCH 331/338 cgroup: Allocate cgroup_file_ctx for kernfs_open_file->priv
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit 0d2b5955b36250a9428c832664f2079cbf723bec upstream.
of->priv is currently used by each interface file implementation to store private information. This patch collects the current two private data usages into struct cgroup_file_ctx which is allocated and freed by the common path. This allows generic private data which applies to multiple files, which will be used to in the following patch.
Note that cgroup_procs iterator is now embedded as procs.iter in the new cgroup_file_ctx so that it doesn't need to be allocated and freed separately.
v2: union dropped from cgroup_file_ctx and the procs iterator is embedded in
cgroup_file_ctx as suggested by Linus.
v3: Michal pointed out that cgroup1's procs pidlist uses of->priv too.
Converted. Didn't change to embedded allocation as cgroup1 pidlists get stored for caching.
--- kernel/cgroup/cgroup-internal.h | 17 ++++++++++++++++ kernel/cgroup/cgroup-v1.c | 26 +++++++++++++----------- kernel/cgroup/cgroup.c | 42 ++++++++++++++++++++++++---------------- 3 files changed, 57 insertions(+), 28 deletions(-)
kernel/cgroup/cgroup-internal.h +17 -0
@@ -34,6 +34,23 @@ extern char trace_cgroup_path[TRACE_CGRO } \ }while (0 ) +struct cgroup_pidlist; + +struct cgroup_file_ctx { +struct { +void *trigger; + } psi; + +struct { +bool started; +struct css_task_iter iter; + } procs; + +struct { +struct cgroup_pidlist *pidlist; + } procs1; +}; +/* * A cgroup can be associated with multiple css_sets as different tasks may * belong to different cgroups on different hierarchies. In the other
kernel/cgroup/cgroup-v1.c +14 -12
@@ -426,6 +426,7 @@ static void *cgroup_pidlist_start(struct* next pid to display, if any */ struct kernfs_open_file *of = s->private; +struct cgroup_file_ctx *ctx = of->priv;struct cgroup *cgrp =seq_css (s)->cgroup;struct cgroup_pidlist *l;enum cgroup_filetype type =seq_cft (s)->private;
@@ -435,25 +436,24 @@ static void *cgroup_pidlist_start(structmutex_lock (&cgrp->pidlist_mutex);/* -* !NULL @of->priv indicates that this isn't the first start() -* after open. If the matching pidlist is around, we can use that. -* Look for it. Note that @of->priv can't be used directly. It -* could already have been destroyed. +* !NULL @ctx->procs1.pidlist indicates that this isn't the first +* start() after open. If the matching pidlist is around, we can use +* that. Look for it. Note that @ctx->procs1.pidlist can't be used +* directly. It could already have been destroyed. */ -if (of->priv) - of->priv =cgroup_pidlist_find (cgrp, type); +if (ctx->procs1.pidlist) + ctx->procs1.pidlist =cgroup_pidlist_find (cgrp, type);/* * Either this is the first start() after open or the matching * pidlist has been destroyed inbetween. Create a new one. */ -if (!of->priv) { - ret =pidlist_array_load (cgrp, type, - (struct cgroup_pidlist **)&of->priv); +if (!ctx->procs1.pidlist) { + ret =pidlist_array_load (cgrp, type, &ctx->procs1.pidlist);if (ret)return ERR_PTR (ret); } - l = of->priv; + l = ctx->procs1.pidlist;if (pid) {int end = l->length;
@@ -481,7 +481,8 @@ static void *cgroup_pidlist_start(structstatic void cgroup_pidlist_stop (struct seq_file *s,void *v) {struct kernfs_open_file *of = s->private; -struct cgroup_pidlist *l = of->priv; +struct cgroup_file_ctx *ctx = of->priv; +struct cgroup_pidlist *l = ctx->procs1.pidlist;if (l) mod_delayed_work(cgroup_pidlist_destroy_wq, &l->destroy_dwork,
@@ -492,7 +493,8 @@ static void cgroup_pidlist_stop(struct sstatic void *cgroup_pidlist_next (struct seq_file *s,void *v,loff_t *pos) {struct kernfs_open_file *of = s->private; -struct cgroup_pidlist *l = of->priv; +struct cgroup_file_ctx *ctx = of->priv; +struct cgroup_pidlist *l = ctx->procs1.pidlist;pid_t *p = v;pid_t *end = l->list + l->length;/*
kernel/cgroup/cgroup.c +26 -16
86 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 332/338 cgroup: Use open-time cgroup namespace for process migration perm checks
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit e57457641613fef0d147ede8bd6a3047df588b95 upstream.
cgroup process migration permission checks are performed at write time as whether a given operation is allowed or not is dependent on the content of the write - the PID. This currently uses current's cgroup namespace which is a potential security weakness as it may allow scenarios where a less privileged process tricks a more privileged one into writing into a fd that it created.
This patch makes cgroup remember the cgroup namespace at the time of open and uses it for migration permission checks instad of current's. Note that this only applies to cgroup2 as cgroup1 doesn't have namespace support.
This also fixes a use-after-free bug on cgroupns reported in
https://lore.kernel.org/r/[email protected]
Note that backporting this fix also requires the preceding patch.
[OP: backport to v4.19: drop changes to cgroup_attach_permissions() and cgroup_css_set_fork(), adjust cgroup_procs_write_permission() calls]
--- kernel/cgroup/cgroup-internal.h | 2 ++ kernel/cgroup/cgroup.c | 24 +++++++++++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-)
kernel/cgroup/cgroup-internal.h +2 -0
@@ -37,6 +37,8 @@ extern char trace_cgroup_path[TRACE_CGROstruct cgroup_pidlist ;struct cgroup_file_ctx { +struct cgroup_namespace *ns; +struct {void *trigger; } psi;
kernel/cgroup/cgroup.c +17 -7
@@ -3457,14 +3457,19 @@ static int cgroup_file_open(struct kernf ctx =kzalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx)return -ENOMEM ; + + ctx->ns = current->nsproxy->cgroup_ns; +get_cgroup_ns (ctx->ns); of->priv = ctx;if (!cft->open)return 0 ; ret = cft->open (of); -if (ret) +if (ret) { +put_cgroup_ns (ctx->ns);kfree (ctx); + }return ret; }
@@ -3475,13 +3480,14 @@ static void cgroup_file_release(struct kif (cft->release) cft->release (of); +put_cgroup_ns (ctx->ns);kfree (ctx); }static ssize_t cgroup_file_write (struct kernfs_open_file *of,char *buf,size_t nbytes,loff_t off) { -struct cgroup_namespace *ns = current->nsproxy->cgroup_ns; +struct cgroup_file_ctx *ctx = of->priv;struct cgroup *cgrp = of->kn->parent->priv;struct cftype *cft = of->kn->priv;struct cgroup_subsys_state *css;
@@ -3495,7 +3501,7 @@ static ssize_t cgroup_file_write(struct*/ if ((cgrp->root->flags &CGRP_ROOT_NS_DELEGATE ) && !(cft->flags &CFTYPE_NS_DELEGATABLE ) && - ns != &init_cgroup_ns && ns->root_cset->dfl_cgrp == cgrp) + ctx->ns != &init_cgroup_ns && ctx->ns->root_cset->dfl_cgrp == cgrp)return -EPERM ;if (cft->write)
@@ -4457,9 +4463,9 @@ static int cgroup_procs_show(struct seq_static int cgroup_procs_write_permission (struct cgroup *src_cgrp,struct cgroup *dst_cgrp, -struct super_block *sb) +struct super_block *sb, +struct cgroup_namespace *ns) { -struct cgroup_namespace *ns = current->nsproxy->cgroup_ns;struct cgroup *com_cgrp = src_cgrp;struct inode *inode;int ret;
@@ -4495,6 +4501,7 @@ static int cgroup_procs_write_permissionstatic ssize_t cgroup_procs_write (struct kernfs_open_file *of,char *buf,size_t nbytes,loff_t off) { +struct cgroup_file_ctx *ctx = of->priv;struct cgroup *src_cgrp, *dst_cgrp;struct task_struct *task;const struct cred *saved_cred;
@@ -4521,7 +4528,8 @@ static ssize_t cgroup_procs_write(struct*/ saved_cred =override_creds (of->file->f_cred); ret =cgroup_procs_write_permission (src_cgrp, dst_cgrp, - of->file->f_path.dentry->d_sb); + of->file->f_path.dentry->d_sb, + ctx->ns);revert_creds (saved_cred);if (ret) goto out_finish;
@@ -4544,6 +4552,7 @@ static void *cgroup_threads_start(structstatic ssize_t cgroup_threads_write (struct kernfs_open_file *of,char *buf,size_t nbytes,loff_t off) { +struct cgroup_file_ctx *ctx = of->priv;struct cgroup *src_cgrp, *dst_cgrp;struct task_struct *task;const struct cred *saved_cred;
@@ -4572,7 +4581,8 @@ static ssize_t cgroup_threads_write(stru*/ saved_cred =override_creds (of->file->f_cred); ret =cgroup_procs_write_permission (src_cgrp, dst_cgrp, - of->file->f_path.dentry->d_sb); + of->file->f_path.dentry->d_sb, + ctx->ns);revert_creds (saved_cred);if (ret) goto out_finish;
Greg Kroah-Hartman
maintainerPATCH 333/338 selftests: cgroup: Make cg_create() use 0755 for permission instead of 0644
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit b09c2baa56347ae65795350dfcc633dedb1c2970 upstream.
0644 is an odd perm to create a cgroup which is a directory. Use the regular 0755 instead. This is necessary for euid switching test case.
--- tools/testing/selftests/cgroup/cgroup_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/cgroup/cgroup_util.c +1 -1
@@ -192,7 +192,7 @@ int cg_find_unified_root(char *root, sizint cg_create (const char *cgroup) { -return mkdir (cgroup,0644 ); +return mkdir (cgroup,0755 ); }static int cg_killall (const char *cgroup)
Greg Kroah-Hartman
maintainerPATCH 334/338 selftests: cgroup: Test open-time credential usage for migration checks
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit 613e040e4dc285367bff0f8f75ea59839bc10947 upstream.
When a task is writing to an fd opened by a different task, the perm check should use the credentials of the latter task. Add a test for it.
--- tools/testing/selftests/cgroup/test_core.c | 68 +++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+)
tools/testing/selftests/cgroup/test_core.c +68 -0
@@ -354,6 +354,73 @@ cleanup:return ret; } +/* +* cgroup migration permission check should be performed based on the +* credentials at the time of open instead of write. +*/ +static int test_cgcore_lesser_euid_open (const char *root) +{ +const uid_t test_euid =65534 ;/* usually nobody, any !root is fine */ +int ret =KSFT_FAIL ; +char *cg_test_a =NULL , *cg_test_b =NULL ; +char *cg_test_a_procs =NULL , *cg_test_b_procs =NULL ; +int cg_test_b_procs_fd =-1 ; +uid_t saved_uid; + + cg_test_a =cg_name (root,"cg_test_a" ); + cg_test_b =cg_name (root,"cg_test_b" ); + +if (!cg_test_a || !cg_test_b) + goto cleanup; + + cg_test_a_procs =cg_name (cg_test_a,"cgroup.procs" ); + cg_test_b_procs =cg_name (cg_test_b,"cgroup.procs" ); + +if (!cg_test_a_procs || !cg_test_b_procs) + goto cleanup; + +if (cg_create (cg_test_a) ||cg_create (cg_test_b)) + goto cleanup; + +if (cg_enter_current (cg_test_a)) + goto cleanup; + +if (chown (cg_test_a_procs, test_euid,-1 ) || +chown (cg_test_b_procs, test_euid,-1 )) + goto cleanup; + + saved_uid =geteuid (); +if (seteuid (test_euid)) + goto cleanup; + + cg_test_b_procs_fd =open (cg_test_b_procs,O_RDWR ); + +if (seteuid (saved_uid)) + goto cleanup; + +if (cg_test_b_procs_fd <0 ) + goto cleanup; + +if (write (cg_test_b_procs_fd,"0" ,1 ) >=0 || errno !=EACCES ) + goto cleanup; + + ret =KSFT_PASS ; + +cleanup: +cg_enter_current (root); +if (cg_test_b_procs_fd >=0 ) +close (cg_test_b_procs_fd); +if (cg_test_b) +cg_destroy (cg_test_b); +if (cg_test_a) +cg_destroy (cg_test_a); +free (cg_test_b_procs); +free (cg_test_a_procs); +free (cg_test_b); +free (cg_test_a); +return ret; +} +#define T (x) { x, #x }struct corecg_test {int (*fn)(const char *root);
@@ -366,6 +433,7 @@ struct corecg_test {T (test_cgcore_parent_becomes_threaded),T (test_cgcore_invalid_domain),T (test_cgcore_populated), + T(test_cgcore_lesser_euid_open), };#undef T
Greg Kroah-Hartman
maintainerPATCH 335/338 selftests: cgroup: Test open-time cgroup namespace usage for migration checks
In reply to Greg Kroah-HartmanFrom: Tejun Heo <[email protected]>
commit bf35a7879f1dfb0d050fe779168bcf25c7de66f5 upstream.
When a task is writing to an fd opened by a different task, the perm check should use the cgroup namespace of the latter task. Add a test for it.
--- tools/testing/selftests/cgroup/test_core.c | 99 +++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+)
tools/testing/selftests/cgroup/test_core.c +99 -0
@@ -1,8 +1,13 @@/* SPDX-License-Identifier: GPL-2.0 */ +#define _GNU_SOURCE#include <linux/limits.h> +#include <linux/sched.h> #include <sys/types.h> +#include <sys/wait.h> #include <unistd.h> +#include <fcntl.h> +#include <sched.h> #include <stdio.h> #include <errno.h>
@@ -421,6 +426,99 @@ cleanup:return ret; } +struct lesser_ns_open_thread_arg { +const char *path; +int fd; +int err; +}; + +static int lesser_ns_open_thread_fn (void *arg) +{ +struct lesser_ns_open_thread_arg *targ = arg; + + targ->fd =open (targ->path,O_RDWR ); + targ->err = errno; +return 0 ; +} + +/* +* cgroup migration permission check should be performed based on the cgroup +* namespace at the time of open instead of write. +*/ +static int test_cgcore_lesser_ns_open (const char *root) +{ +static char stack[65536 ]; +const uid_t test_euid =65534 ;/* usually nobody, any !root is fine */ +int ret =KSFT_FAIL ; +char *cg_test_a =NULL , *cg_test_b =NULL ; +char *cg_test_a_procs =NULL , *cg_test_b_procs =NULL ; +int cg_test_b_procs_fd =-1 ; +struct lesser_ns_open_thread_arg targ = { .fd =-1 }; +pid_t pid; +int status; + + cg_test_a =cg_name (root,"cg_test_a" ); + cg_test_b =cg_name (root,"cg_test_b" ); + +if (!cg_test_a || !cg_test_b) + goto cleanup; + + cg_test_a_procs =cg_name (cg_test_a,"cgroup.procs" ); + cg_test_b_procs =cg_name (cg_test_b,"cgroup.procs" ); + +if (!cg_test_a_procs || !cg_test_b_procs) + goto cleanup; + +if (cg_create (cg_test_a) ||cg_create (cg_test_b)) + goto cleanup; + +if (cg_enter_current (cg_test_b)) + goto cleanup; + +if (chown (cg_test_a_procs, test_euid,-1 ) || +chown (cg_test_b_procs, test_euid,-1 )) + goto cleanup; + + targ.path = cg_test_b_procs; + pid =clone (lesser_ns_open_thread_fn, stack +sizeof (stack), +CLONE_NEWCGROUP |CLONE_FILES |CLONE_VM |SIGCHLD , + &targ); +if (pid <0 ) + goto cleanup; + +if (waitpid (pid, &status,0 ) <0 ) + goto cleanup; + +if (!WIFEXITED (status)) + goto cleanup; + + cg_test_b_procs_fd = targ.fd; +if (cg_test_b_procs_fd <0 ) + goto cleanup; + +if (cg_enter_current (cg_test_a)) + goto cleanup; + +if ((status =write (cg_test_b_procs_fd,"0" ,1 )) >=0 || errno !=ENOENT ) + goto cleanup; + + ret =KSFT_PASS ; + +cleanup: +cg_enter_current (root); +if (cg_test_b_procs_fd >=0 ) +close (cg_test_b_procs_fd); +if (cg_test_b) +cg_destroy (cg_test_b); +if (cg_test_a) +cg_destroy (cg_test_a); +free (cg_test_b_procs); +free (cg_test_a_procs); +free (cg_test_b); +free (cg_test_a); +return ret; +} +#define T (x) { x, #x }struct corecg_test {int (*fn)(const char *root);
@@ -434,6 +532,7 @@ struct corecg_test {T (test_cgcore_invalid_domain),T (test_cgcore_populated),T (test_cgcore_lesser_euid_open), + T(test_cgcore_lesser_ns_open), };#undef T
Greg Kroah-Hartman
maintainerPATCH 336/338 xfrm: policy: match with both mark and mask on user interfaces
In reply to Greg Kroah-HartmanFrom: Xin Long <[email protected]>
commit 4f47e8ab6ab796b5380f74866fa5287aca4dcc58 upstream.
In commit ed17b8d377ea ("xfrm: fix a warning in xfrm_policy_insert_list"), it would take 'priority' to make a policy unique, and allow duplicated policies with different 'priority' to be added, which is not expected by userland, as Tobias reported in strongswan.
To fix this duplicated policies issue, and also fix the issue in commit ed17b8d377ea ("xfrm: fix a warning in xfrm_policy_insert_list"), when doing add/del/get/update on user interfaces, this patch is to change to look up a policy with both mark and mask by doing:
mark.v == pol->mark.v && mark.m == pol->mark.m
and leave the check:
(mark & pol->mark.m) == pol->mark.v
for tx/rx path only.
As the userland expects an exact mark and mask match to manage policies.
v1->v2:
- make xfrm_policy_mark_match inline and fix the changelog as Tobias suggested.
--- include/net/xfrm.h | 11 +++++++---- net/key/af_key.c | 4 ++-- net/xfrm/xfrm_policy.c | 32 +++++++++++++------------------- net/xfrm/xfrm_user.c | 18 +++++++++++------- 4 files changed, 33 insertions(+), 32 deletions(-)
include/net/xfrm.h +7 -4
@@ -1739,13 +1739,16 @@ int xfrm_policy_walk(struct net *net, st void *);void xfrm_policy_walk_done (struct xfrm_policy_walk *walk,struct net *net);int xfrm_policy_insert (int dir,struct xfrm_policy *policy,int excl); -struct xfrm_policy *xfrm_policy_bysel_ctx (struct net *net,u32 mark,u32 if_id, -u8 type,int dir, +struct xfrm_policy *xfrm_policy_bysel_ctx (struct net *net, +const struct xfrm_mark *mark, +u32 if_id,u8 type,int dir,struct xfrm_selector *sel,struct xfrm_sec_ctx *ctx,int delete,int *err); -struct xfrm_policy *xfrm_policy_byid (struct net *net,u32 mark,u32 if_id,u8 , -int dir,u32 id,int delete,int *err); +struct xfrm_policy *xfrm_policy_byid (struct net *net, +const struct xfrm_mark *mark,u32 if_id, +u8 type,int dir,u32 id,int delete, +int *err);int xfrm_policy_flush (struct net *net,u8 type,bool task_valid);void xfrm_policy_hash_rebuild (struct net *net);u32 xfrm_get_acqseq (void );
net/key/af_key.c +2 -2
@@ -2413,7 +2413,7 @@ static int pfkey_spddelete(struct sock *return err; } - xp =xfrm_policy_bysel_ctx (net,DUMMY_MARK ,0 ,XFRM_POLICY_TYPE_MAIN , + xp =xfrm_policy_bysel_ctx (net, &dummy_mark,0 ,XFRM_POLICY_TYPE_MAIN , pol->sadb_x_policy_dir -1 , &sel, pol_ctx,1 , &err);security_xfrm_policy_free (pol_ctx);
@@ -2664,7 +2664,7 @@ static int pfkey_spdget(struct sock *sk,return -EINVAL ; delete = (hdr->sadb_msg_type ==SADB_X_SPDDELETE2 ); - xp =xfrm_policy_byid (net,DUMMY_MARK ,0 ,XFRM_POLICY_TYPE_MAIN , + xp =xfrm_policy_byid (net, &dummy_mark,0 ,XFRM_POLICY_TYPE_MAIN , dir, pol->sadb_x_policy_id, delete, &err);if (xp ==NULL )return -ENOENT ;
net/xfrm/xfrm_policy.c +13 -19
@@ -727,14 +727,10 @@ static void xfrm_policy_requeue(struct xspin_unlock_bh (&pq->hold_queue.lock); } -static bool xfrm_policy_mark_match (struct xfrm_policy *policy, -struct xfrm_policy *pol) +static inline bool xfrm_policy_mark_match (const struct xfrm_mark *mark, +struct xfrm_policy *pol) { -if (policy->mark.v == pol->mark.v && - policy->priority == pol->priority) -return true; - -return false; +return mark->v == pol->mark.v && mark->m == pol->mark.m; }int xfrm_policy_insert (int dir,struct xfrm_policy *policy,int excl)
@@ -753,7 +749,7 @@ int xfrm_policy_insert(int dir, struct xif (pol->type == policy->type && pol->if_id == policy->if_id && !selector_cmp (&pol->selector, &policy->selector) && -xfrm_policy_mark_match (policy, pol) && +xfrm_policy_mark_match (&policy->mark, pol) &&xfrm_sec_ctx_match (pol->security, policy->security) && !WARN_ON (delpol)) {if (excl) {
@@ -803,11 +799,10 @@ int xfrm_policy_insert(int dir, struct x }EXPORT_SYMBOL (xfrm_policy_insert); -struct xfrm_policy *xfrm_policy_bysel_ctx (struct net *net,u32 mark,u32 if_id, -u8 type,int dir, -struct xfrm_selector *sel, -struct xfrm_sec_ctx *ctx,int delete, -int *err) +struct xfrm_policy * +xfrm_policy_bysel_ctx (struct net *net,const struct xfrm_mark *mark,u32 if_id, +u8 type,int dir,struct xfrm_selector *sel, +struct xfrm_sec_ctx *ctx,int delete,int *err) {struct xfrm_policy *pol, *ret;struct hlist_head *chain;
@@ -819,7 +814,7 @@ struct xfrm_policy *xfrm_policy_bysel_cthlist_for_each_entry (pol, chain, bydst) {if (pol->type == type && pol->if_id == if_id && - (mark & pol->mark.m) == pol->mark.v && +xfrm_policy_mark_match (mark, pol) && !selector_cmp (sel, &pol->selector) &&xfrm_sec_ctx_match (ctx, pol->security)) {xfrm_pol_hold (pol);
@@ -844,9 +839,9 @@ struct xfrm_policy *xfrm_policy_bysel_ct }EXPORT_SYMBOL (xfrm_policy_bysel_ctx); -struct xfrm_policy *xfrm_policy_byid (struct net *net,u32 mark,u32 if_id, -u8 type,int dir,u32 id,int delete, -int *err) +struct xfrm_policy * +xfrm_policy_byid (struct net *net,const struct xfrm_mark *mark,u32 if_id, +u8 type,int dir,u32 id,int delete,int *err) {struct xfrm_policy *pol, *ret;struct hlist_head *chain;
@@ -861,8 +856,7 @@ struct xfrm_policy *xfrm_policy_byid(str ret =NULL ;hlist_for_each_entry (pol, chain, byidx) {if (pol->type == type && pol->index == id && - pol->if_id == if_id && - (mark & pol->mark.m) == pol->mark.v) { + pol->if_id == if_id &&xfrm_policy_mark_match (mark, pol)) {xfrm_pol_hold (pol);if (delete) { *err = security_xfrm_policy_delete(
net/xfrm/xfrm_user.c +11 -7
@@ -1862,7 +1862,6 @@ static int xfrm_get_policy(struct sk_bufstruct km_event c;int delete;struct xfrm_mark m; -u32 mark =xfrm_mark_get (attrs, &m);u32 if_id =0 ; p =nlmsg_data (nlh);
@@ -1879,8 +1878,11 @@ static int xfrm_get_policy(struct sk_bufif (attrs[XFRMA_IF_ID ]) if_id =nla_get_u32 (attrs[XFRMA_IF_ID ]); +xfrm_mark_get (attrs, &m); +if (p->index) - xp =xfrm_policy_byid (net, mark, if_id, type, p->dir, p->index, delete, &err); + xp =xfrm_policy_byid (net, &m, if_id, type, p->dir, + p->index, delete, &err);else {struct nlattr *rt = attrs[XFRMA_SEC_CTX ];struct xfrm_sec_ctx *ctx;
@@ -1897,8 +1899,8 @@ static int xfrm_get_policy(struct sk_bufif (err)return err; } - xp =xfrm_policy_bysel_ctx (net, mark, if_id, type, p->dir, &p->sel, - ctx, delete, &err); + xp =xfrm_policy_bysel_ctx (net, &m, if_id, type, p->dir, + &p->sel, ctx, delete, &err);security_xfrm_policy_free (ctx); }if (xp ==NULL )
@@ -2165,7 +2167,6 @@ static int xfrm_add_pol_expire(struct sku8 type =XFRM_POLICY_TYPE_MAIN ;int err = -ENOENT ;struct xfrm_mark m; -u32 mark =xfrm_mark_get (attrs, &m);u32 if_id =0 ; err =copy_from_user_policy_type (&type, attrs);
@@ -2179,8 +2180,11 @@ static int xfrm_add_pol_expire(struct skif (attrs[XFRMA_IF_ID ]) if_id =nla_get_u32 (attrs[XFRMA_IF_ID ]); +xfrm_mark_get (attrs, &m); +if (p->index) - xp =xfrm_policy_byid (net, mark, if_id, type, p->dir, p->index,0 , &err); + xp =xfrm_policy_byid (net, &m, if_id, type, p->dir, p->index, +0 , &err);else {struct nlattr *rt = attrs[XFRMA_SEC_CTX ];struct xfrm_sec_ctx *ctx;
@@ -2197,7 +2201,7 @@ static int xfrm_add_pol_expire(struct skif (err)return err; } - xp =xfrm_policy_bysel_ctx (net, mark, if_id, type, p->dir, + xp =xfrm_policy_bysel_ctx (net, &m, if_id, type, p->dir, &p->sel, ctx,0 , &err);security_xfrm_policy_free (ctx); }
Greg Kroah-Hartman
maintainerPATCH 337/338 drm/amdgpu: Check if fd really is an amdgpu fd.
In reply to Greg Kroah-HartmanFrom: Bas Nieuwenhuizen <[email protected]>
commit 021830d24ba55a578f602979274965344c8e6284 upstream.
Otherwise we interpret the file private data as drm & amdgpu data while it might not be, possibly allowing one to get memory corruption.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 ++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 10 +++++++--- 3 files changed, 25 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -0
@@ -955,6 +955,8 @@ struct amdgpu_gfx {DECLARE_BITMAP (pipe_reserve_bitmap,AMDGPU_MAX_COMPUTE_QUEUES ); }; +int amdgpu_file_to_fpriv (struct file *filp,struct amdgpu_fpriv **fpriv); +int amdgpu_ib_get (struct amdgpu_device *adev,struct amdgpu_vm *vm,unsigned size,struct amdgpu_ib *ib); void amdgpu_ib_free(struct amdgpu_device *adev, struct amdgpu_ib *ib,
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +16 -0
@@ -1132,6 +1132,22 @@ static const struct file_operations amdg#endif }; +int amdgpu_file_to_fpriv (struct file *filp,struct amdgpu_fpriv **fpriv) +{ +struct drm_file *file; + +if (!filp) +return -EINVAL ; + +if (filp->f_op != &amdgpu_driver_kms_fops) { +return -EINVAL ; + } + + file = filp->private_data; + *fpriv = file->driver_priv; +return 0 ; +} + static bool amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, bool in_vblank_irq, int *vpos, int *hpos,
drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c +7 -3
@@ -54,16 +54,20 @@ static int amdgpu_sched_process_priority enum drm_sched_priority priority) {struct file *filp =fget (fd); -struct drm_file *file;struct amdgpu_fpriv *fpriv;struct amdgpu_ctx *ctx;uint32_t id; +int r;if (!filp)return -EINVAL ; - file = filp->private_data; - fpriv = file->driver_priv; + r =amdgpu_file_to_fpriv (filp, &fpriv); +if (r) { +fput (filp); +return r; + } +idr_for_each_entry (&fpriv->ctx_mgr.ctx_handles, ctx, id)amdgpu_ctx_priority_override (ctx, priority);
Greg Kroah-Hartman
maintainerPATCH 338/338 drm/amdkfd: Use drm_priv to pass VM from KFD to amdgpu
In reply to Greg Kroah-HartmanFrom: Felix Kuehling <[email protected]>
commit b40a6ab2cf9213923bf8e821ce7fa7f6a0a26990 upstream.
amdgpu_amdkfd_gpuvm_alloc_memory_of_gpu needs the drm_priv to allow mmap to access the BO through the corresponding file descriptor. The VM can also be extracted from drm_priv, so drm_priv can replace the vm parameter in the kfd2kgd interface.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +7 -3
@@ -1044,11 +1044,15 @@ int amdgpu_amdkfd_gpuvm_acquire_process_ struct dma_fence **ef) {struct amdgpu_device *adev =get_amdgpu_device (kgd); -struct drm_file *drm_priv = filp->private_data; -struct amdgpu_fpriv *drv_priv = drm_priv->driver_priv; -struct amdgpu_vm *avm = &drv_priv->vm; +struct amdgpu_fpriv *drv_priv; +struct amdgpu_vm *avm;int ret; + ret =amdgpu_file_to_fpriv (filp, &drv_priv); +if (ret) +return ret; + avm = &drv_priv->vm; +/* Already a compute VM? */ if (avm->process_info)return -EINVAL ;
Hi!
Quoted 4 lines
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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.
CIP testing did not find any kernel problems here (but we have some problems with test):
https://gitlab.com/cip-project/cip-testing/linux-stable-rc-ci/-/tree/linux-4.19.y
Best regards,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.238-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.238-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Tested on arm64 and x86 for 4.19.238-rc1,
Kernel repo:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
Branch: linux-4.19.y
Version: 4.19.238-rc1
Commit: 3f08640122e30667d6aa2e90e4fa57f3d9f48ceb
Compiler: gcc version 7.3.0 (GCC)
arm64:
--------------------------------------------------------------------
Testcase Result Summary:
total: 8957
passed: 8957
failed: 0
timeout: 0
--------------------------------------------------------------------
x86:
--------------------------------------------------------------------
Testcase Result Summary:
total: 8957
passed: 8957
failed: 0
timeout: 0
--------------------------------------------------------------------
Quoted 5 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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.
Build results:
total: 156 pass: 156 fail: 0 Qemu test results: total: 425 pass: 425 fail: 0
Guenter
Hello!
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.238-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Results from Linaro's test farm.
No regressions on arm64, arm, x86_64, and i386.
## Build
* kernel: 4.19.238-rc1
* git: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
* git branch: linux-4.19.y
* git commit: 3f08640122e30667d6aa2e90e4fa57f3d9f48ceb
* git describe: v4.19.237-339-g3f08640122e3
* test details: https://qa-reports.linaro.org/lkft/linux-stable-rc-linux-4.19.y/build/v4.19.237-339-g3f08640122e3
## No Test Regressions (compared to v4.19.237)
## No Metric Regressions (compared to v4.19.237)
## No Test Fixes (compared to v4.19.237)
## No Metric Fixes (compared to v4.19.237)
## Test result summary
total: 86571, pass: 69522, fail: 1159, skip: 13859, xfail: 2031
## Build Summary
* arm: 281 total, 275 passed, 6 failed
* arm64: 39 total, 39 passed, 0 failed
* dragonboard-410c: 1 total, 1 passed, 0 failed
* hi6220-hikey: 1 total, 1 passed, 0 failed
* i386: 19 total, 19 passed, 0 failed
* juno-r2: 1 total, 1 passed, 0 failed
* mips: 27 total, 27 passed, 0 failed
* powerpc: 60 total, 54 passed, 6 failed
* s390: 12 total, 12 passed, 0 failed
* sparc: 12 total, 12 passed, 0 failed
* x15: 1 total, 1 passed, 0 failed
* x86: 1 total, 1 passed, 0 failed
* x86_64: 38 total, 38 passed, 0 failed
## Test suites summary
* fwts
* kselftest-android
* kselftest-arm64
* kselftest-bpf
* kselftest-breakpoints
* kselftest-capabilities
* kselftest-cgroup
* kselftest-clone3
* kselftest-core
* kselftest-cpu-hotplug
* kselftest-cpufreq
* kselftest-drivers
* kselftest-efivarfs
* kselftest-filesystems
* kselftest-firmware
* kselftest-fpu
* kselftest-futex
* kselftest-gpio
* kselftest-intel_pstate
* kselftest-ipc
* kselftest-ir
* kselftest-kcmp
* kselftest-kexec
* kselftest-kvm
* kselftest-lib
* kselftest-livepatch
* kselftest-membarrier
* kselftest-memfd
* kselftest-memory-hotplug
* kselftest-mincore
* kselftest-mount
* kselftest-mqueue
* kselftest-net
* kselftest-netfilter
* kselftest-nsfs
* kselftest-openat2
* kselftest-pid_namespace
* kselftest-pidfd
* kselftest-proc
* kselftest-pstore
* kselftest-ptrace
* kselftest-rseq
* kselftest-rtc
* kselftest-seccomp
* kselftest-sigaltstack
* kselftest-size
* kselftest-splice
* kselftest-static_keys
* kselftest-sync
* kselftest-sysctl
* kselftest-tc-testing
* kselftest-timens
* kselftest-timers
* kselftest-tmpfs
* kselftest-tpm2
* kselftest-user
* kselftest-vm
* kselftest-x86
* kselftest-zram
* kvm-unit-tests
* libhugetlbfs
* linux-log-parser
* ltp-cap_bounds-tests
* ltp-commands-tests
* ltp-containers-tests
* ltp-controllers-tests
* ltp-cpuhotplug-tests
* ltp-crypto-tests
* ltp-cve-tests
* ltp-dio-tests
* ltp-fcntl-locktests-tests
* ltp-filecaps-tests
* ltp-fs-tests
* ltp-fs_bind-tests
* ltp-fs_perms_simple-tests
* ltp-fsx-tests
* ltp-hugetlb-tests
* ltp-io-tests
* ltp-ipc-tests
* ltp-math-tests
* ltp-mm-tests
* ltp-nptl-tests
* ltp-open-posix-tests
* ltp-pty-tests
* ltp-sched-tests
* ltp-securebits-tests
* ltp-syscalls-tests
* ltp-tracing-tests
* network-basic-tests
* packetdrill
* perf
* rcutorture
* ssuite
* v4l2-compliance
* vdso
Greetings!
Daniel Díaz
[email protected]
Signature · 2 lines
Linaro LKFT https://lkft.linaro.org
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.238-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Following kernel warning noticed on arm64 Juno-r2 while booting stable-rc 4.19.238. Here is the full test log link [1].
[ 0.000000] Booting Linux on physical CPU 0x0000000100 [0x410fd033]
[ 0.000000] Linux version 4.19.238 (tuxmake@tuxmake) (gcc version
11.2.0 (Debian 11.2.0-18)) #1 SMP PREEMPT @1650206156
[ 0.000000] Machine model: ARM Juno development board (r2)
<trim>
[ 18.499895] ================================
[ 18.504172] WARNING: inconsistent lock state
[ 18.508451] 4.19.238 #1 Not tainted
[ 18.511944] --------------------------------
[ 18.516222] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage.
[ 18.522242] kworker/u12:3/60 [HC0[0]:SC0[0]:HE1:SE1] takes:
[ 18.527826] (____ptrval____)
(&(&xprt->transport_lock)->rlock){+.?.}, at: xprt_destroy+0x70/0xe0
[ 18.536648] {IN-SOFTIRQ-W} state was registered at:
[ 18.541543] lock_acquire+0xc8/0x23c
[ 18.545216] _raw_spin_lock+0x50/0x64
[ 18.548973] xs_tcp_state_change+0x1b4/0x440
[ 18.553343] tcp_rcv_state_process+0x684/0x1300
[ 18.557972] tcp_v4_do_rcv+0x70/0x290
[ 18.561731] tcp_v4_rcv+0xc34/0xda0
[ 18.565316] ip_local_deliver_finish+0x16c/0x3c0
[ 18.570032] ip_local_deliver+0x6c/0x240
[ 18.574051] ip_rcv_finish+0x98/0xe4
[ 18.577722] ip_rcv+0x68/0x210
[ 18.580871] __netif_receive_skb_one_core+0x6c/0x9c
[ 18.585847] __netif_receive_skb+0x2c/0x74
[ 18.590039] netif_receive_skb_internal+0x88/0x20c
[ 18.594928] netif_receive_skb+0x68/0x1a0
[ 18.599036] smsc911x_poll+0x104/0x290
[ 18.602881] net_rx_action+0x124/0x4bc
[ 18.606727] __do_softirq+0x1d0/0x524
[ 18.610484] irq_exit+0x11c/0x144
[ 18.613894] __handle_domain_irq+0x84/0xe0
[ 18.618086] gic_handle_irq+0x5c/0xb0
[ 18.621843] el1_irq+0xb4/0x130
[ 18.625081] cpuidle_enter_state+0xc0/0x3ec
[ 18.629361] cpuidle_enter+0x38/0x4c
[ 18.633032] do_idle+0x200/0x2c0
[ 18.636353] cpu_startup_entry+0x30/0x50
[ 18.640372] rest_init+0x260/0x270
[ 18.643870] start_kernel+0x45c/0x490
[ 18.647625] irq event stamp: 18931
[ 18.651037] hardirqs last enabled at (18931): [<ffff00000832e800>]
kfree+0xe0/0x370
[ 18.658799] hardirqs last disabled at (18930): [<ffff00000832e7ec>]
kfree+0xcc/0x370
[ 18.666564] softirqs last enabled at (18920): [<ffff000008fbce94>]
rpc_wake_up_first_on_wq+0xb4/0x1b0
[ 18.675893] softirqs last disabled at (18918): [<ffff000008fbce18>]
rpc_wake_up_first_on_wq+0x38/0x1b0
[ 18.685217]
[ 18.685217] other info that might help us debug this:
[ 18.691758] Possible unsafe locking scenario:
[ 18.691758]
[ 18.697689] CPU0
[ 18.700137] ----
[ 18.702586] lock(&(&xprt->transport_lock)->rlock);
[ 18.707562] <Interrupt>
[ 18.710184] lock(&(&xprt->transport_lock)->rlock);
[ 18.715335]
[ 18.715335] *** DEADLOCK ***
[ 18.715335]
[ 18.721270] 2 locks held by kworker/u12:3/60:
[ 18.725633] #0: (____ptrval____)
((wq_completion)\"rpciod\"){+.+.}, at: process_one_work+0x1e0/0x6c0
[ 18.734711] #1: (____ptrval____)
((work_completion)(&task->u.tk_work)){+.+.}, at:
process_one_work+0x1e0/0x6c0
[ 18.744831]
[ 18.744831] stack backtrace:
[ 18.749202] CPU: 0 PID: 60 Comm: kworker/u12:3 Not tainted 4.19.238 #1
[ 18.755741] Hardware name: ARM Juno development board (r2) (DT)
[ 18.761678] Workqueue: rpciod rpc_async_schedule
[ 18.766305] Call trace:
[ 18.768758] dump_backtrace+0x0/0x190
[ 18.772427] show_stack+0x28/0x34
[ 18.775748] dump_stack+0xb0/0xf8
[ 18.779072] print_usage_bug.part.0+0x25c/0x270
[ 18.783613] mark_lock+0x5d0/0x6e0
[ 18.787023] __lock_acquire+0x6c4/0x16f0
[ 18.790955] lock_acquire+0xc8/0x23c
[ 18.794539] _raw_spin_lock+0x50/0x64
[ 18.798210] xprt_destroy+0x70/0xe0
[ 18.801708] xprt_put+0x44/0x50
[ 18.804857] rpc_task_release_client+0x7c/0x90
[ 18.809311] __rpc_execute+0x2a8/0x5f4
[ 18.813069] rpc_async_schedule+0x24/0x30
[ 18.817089] process_one_work+0x28c/0x6c0
[ 18.821108] worker_thread+0x6c/0x450
[ 18.824779] kthread+0x12c/0x16c
[ 18.828015] ret_from_fork+0x10/0x24
[ 18.931718] VFS: Mounted root (nfs filesystem) on device 0:17.metadata:
git_ref: linux-4.19.y
git_repo: https://gitlab.com/Linaro/lkft/mirrors/stable/linux-stable-rc
git_sha: aaad8e56ca1e56fe34b5a33f30fb6f9279969020
git_describe: v4.19.238
kernel_version: 4.19.238
kernel-config: https://builds.tuxbuild.com/27vgbZzdS2aNU90tNu4Hl0IJuIP/config
--
Linaro LKFT
https://lkft.linaro.org
[1] https://lkft.validation.linaro.org/scheduler/job/4909565#L1141
Quoted 79 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.238-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Following kernel warning noticed on arm64 Juno-r2 while booting stable-rc 4.19.238. Here is the full test log link [1].
[ 0.000000] Booting Linux on physical CPU 0x0000000100 [0x410fd033] [ 0.000000] Linux version 4.19.238 (tuxmake@tuxmake) (gcc version 11.2.0 (Debian 11.2.0-18)) #1 SMP PREEMPT @1650206156 [ 0.000000] Machine model: ARM Juno development board (r2) <trim> [ 18.499895] ================================ [ 18.504172] WARNING: inconsistent lock state [ 18.508451] 4.19.238 #1 Not tainted [ 18.511944] -------------------------------- [ 18.516222] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. [ 18.522242] kworker/u12:3/60 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 18.527826] (____ptrval____) (&(&xprt->transport_lock)->rlock){+.?.}, at: xprt_destroy+0x70/0xe0 [ 18.536648] {IN-SOFTIRQ-W} state was registered at: [ 18.541543] lock_acquire+0xc8/0x23c [ 18.545216] _raw_spin_lock+0x50/0x64 [ 18.548973] xs_tcp_state_change+0x1b4/0x440 [ 18.553343] tcp_rcv_state_process+0x684/0x1300 [ 18.557972] tcp_v4_do_rcv+0x70/0x290 [ 18.561731] tcp_v4_rcv+0xc34/0xda0 [ 18.565316] ip_local_deliver_finish+0x16c/0x3c0 [ 18.570032] ip_local_deliver+0x6c/0x240 [ 18.574051] ip_rcv_finish+0x98/0xe4 [ 18.577722] ip_rcv+0x68/0x210 [ 18.580871] __netif_receive_skb_one_core+0x6c/0x9c [ 18.585847] __netif_receive_skb+0x2c/0x74 [ 18.590039] netif_receive_skb_internal+0x88/0x20c [ 18.594928] netif_receive_skb+0x68/0x1a0 [ 18.599036] smsc911x_poll+0x104/0x290 [ 18.602881] net_rx_action+0x124/0x4bc [ 18.606727] __do_softirq+0x1d0/0x524 [ 18.610484] irq_exit+0x11c/0x144 [ 18.613894] __handle_domain_irq+0x84/0xe0 [ 18.618086] gic_handle_irq+0x5c/0xb0 [ 18.621843] el1_irq+0xb4/0x130 [ 18.625081] cpuidle_enter_state+0xc0/0x3ec [ 18.629361] cpuidle_enter+0x38/0x4c [ 18.633032] do_idle+0x200/0x2c0 [ 18.636353] cpu_startup_entry+0x30/0x50 [ 18.640372] rest_init+0x260/0x270 [ 18.643870] start_kernel+0x45c/0x490 [ 18.647625] irq event stamp: 18931 [ 18.651037] hardirqs last enabled at (18931): [<ffff00000832e800>] kfree+0xe0/0x370 [ 18.658799] hardirqs last disabled at (18930): [<ffff00000832e7ec>] kfree+0xcc/0x370 [ 18.666564] softirqs last enabled at (18920): [<ffff000008fbce94>] rpc_wake_up_first_on_wq+0xb4/0x1b0 [ 18.675893] softirqs last disabled at (18918): [<ffff000008fbce18>] rpc_wake_up_first_on_wq+0x38/0x1b0 [ 18.685217] [ 18.685217] other info that might help us debug this: [ 18.691758] Possible unsafe locking scenario:
Quoted 8 lines
[ 18.691758] [ 18.697689] CPU0 [ 18.700137] ---- [ 18.702586] lock(&(&xprt->transport_lock)->rlock); [ 18.707562] <Interrupt> [ 18.710184] lock(&(&xprt->transport_lock)->rlock); [ 18.715335] [ 18.715335] *** DEADLOCK ***
My bisect script pointed to the following kernel commit,
BAT BISECTION OLD: This iteration (kernel rev 2d235d26dcf81d34c93ba8616d75c804b5ee5f3f) presents old behavior. 242a3e0c75b64b4ced82e29e07a6d6d98eeec826 is the first new commit commit 242a3e0c75b64b4ced82e29e07a6d6d98eeec826
Author: NeilBrown <[email protected]> Date: Tue Mar 8 13:42:17 2022 +1100
SUNRPC: avoid race between mod_timer() and del_timer_sync()
commit 3848e96edf4788f772d83990022fa7023a233d83 upstream.
xprt_destory() claims XPRT_LOCKED and then calls del_timer_sync(). Both xprt_unlock_connect() and xprt_release() call
->release_xprt()
which drops XPRT_LOCKED and *then* xprt_schedule_autodisconnect() which calls mod_timer().
This may result in mod_timer() being called *after* del_timer_sync(). When this happens, the timer may fire long after the xprt has been freed, and run_timer_softirq() will probably crash.
The pairing of ->release_xprt() and xprt_schedule_autodisconnect() is always called under ->transport_lock. So if we take ->transport_lock to call del_timer_sync(), we can be sure that mod_timer() will run first (if it runs at all).
net/sunrpc/xprt.c | 7 +++++++ 1 file changed, 7 insertions(+)
--
Linaro LKFT
https://lkft.linaro.org
Quoted 27 lines · Naresh Kamboju
Quoted 26 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.238-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Following kernel warning noticed on arm64 Juno-r2 while booting stable-rc 4.19.238. Here is the full test log link [1].
Quoted 15 lines
Quoted 7 lines
[ 0.000000] Booting Linux on physical CPU 0x0000000100 [0x410fd033] [ 0.000000] Linux version 4.19.238 (tuxmake@tuxmake) (gcc version 11.2.0 (Debian 11.2.0-18)) #1 SMP PREEMPT @1650206156 [ 0.000000] Machine model: ARM Juno development board (r2) <trim> [ 18.499895] ================================ [ 18.504172] WARNING: inconsistent lock stateQuoted 8 lines
[ 18.508451] 4.19.238 #1 Not tainted [ 18.511944] -------------------------------- [ 18.516222] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. [ 18.522242] kworker/u12:3/60 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 18.527826] (____ptrval____) (&(&xprt->transport_lock)->rlock){+.?.}, at: xprt_destroy+0x70/0xe0 [ 18.536648] {IN-SOFTIRQ-W} state was registered at: [ 18.541543] lock_acquire+0xc8/0x23c
Prior to Linux 5.3, ->transport_lock needs spin_lock_bh() and spin_unlock_bh().
Thanks,
NeilBrown
Hi Neil
Quoted 44 lines · NeilBrown
Quoted 27 lines · Naresh Kamboju
Quoted 26 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.238-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Following kernel warning noticed on arm64 Juno-r2 while booting stable-rc 4.19.238. Here is the full test log link [1].
Quoted 15 lines
Quoted 7 lines
[ 0.000000] Booting Linux on physical CPU 0x0000000100 [0x410fd033] [ 0.000000] Linux version 4.19.238 (tuxmake@tuxmake) (gcc version 11.2.0 (Debian 11.2.0-18)) #1 SMP PREEMPT @1650206156 [ 0.000000] Machine model: ARM Juno development board (r2) <trim> [ 18.499895] ================================ [ 18.504172] WARNING: inconsistent lock stateQuoted 8 lines
[ 18.508451] 4.19.238 #1 Not tainted [ 18.511944] -------------------------------- [ 18.516222] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. [ 18.522242] kworker/u12:3/60 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 18.527826] (____ptrval____) (&(&xprt->transport_lock)->rlock){+.?.}, at: xprt_destroy+0x70/0xe0 [ 18.536648] {IN-SOFTIRQ-W} state was registered at: [ 18.541543] lock_acquire+0xc8/0x23c
Quoted 3 lines
Prior to Linux 5.3, ->transport_lock needs
spin_lock_bh()andspin_unlock_bh().
We get the same deadlock or similar one and we think that can be connected to this thread on 4.19.243. For us is a bit difficult to hit but we are going to apply this change
net: sunrpc: Fix deadlock in xprt_destroy
Prior to Linux 5.3, ->transport_lock needs spin_lock_bh() and spin_unlock_bh().
--- net/sunrpc/xprt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/sunrpc/xprt.c +2 -2
@@ -1550,9 +1550,9 @@ static void xprt_destroy(struct rpc_xprt *xprt)* is cleared. We use ->transport_lock to ensure the mod_timer() * can only run *before* del_time_sync(), never after. */ -spin_lock (&xprt->transport_lock); +spin_lock_bh (&xprt->transport_lock);del_timer_sync (&xprt->timer); -spin_unlock (&xprt->transport_lock); +spin_unlock_bh (&xprt->transport_lock);/* * Destroy sockets etc from the system workqueue so they can
Signature · 1 line
2.37.2
Quoted 3 lines
Thanks,
NeilBrown
Thank you
Trond Myklebust
Reviewed-byQuoted 87 lines · Michael Trimarchi
[You don't often get email from [email protected]. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
Hi Neil
Quoted 44 lines · NeilBrown
Quoted 27 lines · Naresh Kamboju
Quoted 26 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.238-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Following kernel warning noticed on arm64 Juno-r2 while booting stable-rc 4.19.238. Here is the full test log link [1].
Quoted 15 lines
Quoted 7 lines
[ 0.000000] Booting Linux on physical CPU 0x0000000100 [0x410fd033] [ 0.000000] Linux version 4.19.238 (tuxmake@tuxmake) (gcc version 11.2.0 (Debian 11.2.0-18)) #1 SMP PREEMPT @1650206156 [ 0.000000] Machine model: ARM Juno development board (r2) <trim> [ 18.499895] ================================ [ 18.504172] WARNING: inconsistent lock stateQuoted 8 lines
[ 18.508451] 4.19.238 #1 Not tainted [ 18.511944] -------------------------------- [ 18.516222] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. [ 18.522242] kworker/u12:3/60 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 18.527826] (____ptrval____) (&(&xprt->transport_lock)->rlock){+.?.}, at: xprt_destroy+0x70/0xe0 [ 18.536648] {IN-SOFTIRQ-W} state was registered at: [ 18.541543] lock_acquire+0xc8/0x23cQuoted 3 lines
Prior to Linux 5.3, ->transport_lock needs
spin_lock_bh()andspin_unlock_bh().We get the same deadlock or similar one and we think that can be connected to this thread on 4.19.243. For us is a bit difficult to hit but we are going to apply this change
net: sunrpc: Fix deadlock in
xprt_destroyPrior to Linux 5.3, ->transport_lock needs
spin_lock_bh()andspin_unlock_bh().Signed-off-by Michael Trimarchi <[email protected]>---
net/sunrpc/xprt.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)net/sunrpc/xprt.c +2
-2@@ -1550,9 +1550,9 @@ static void xprt_destroy(struct rpc_xprt *xprt)* is cleared. We use ->transport_lock to ensure the mod_timer() * can only run *before* del_time_sync(), never after. */ -spin_lock (&xprt->transport_lock); +spin_lock_bh (&xprt->transport_lock);del_timer_sync (&xprt->timer); -spin_unlock (&xprt->transport_lock); +spin_unlock_bh (&xprt->transport_lock);/* * Destroy sockets etc from the system workqueue so they can
Quoted 1 line
—
Agreed. When backporting to kernels that are older than 5.3.x, the transport lock needs to be taken using the bh-safe spin lock variants.
_________________________________
Trond Myklebust
Linux NFS client maintainer, Hammerspace
[email protected]
Hi
Quoted 86 lines · Trond Myklebust
Quoted 86 lines · Michael Trimarchi
[You don't often get email from [email protected]. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
Hi Neil
Quoted 44 lines · NeilBrown
Quoted 27 lines · Naresh Kamboju
Quoted 26 lines · Naresh Kamboju
Quoted 10 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.19.238 release. There are 338 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, 16 Apr 2022 11:07:54 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.238-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.19.y
and the diffstat can be found below.thanks,
greg k-h
Following kernel warning noticed on arm64 Juno-r2 while booting stable-rc 4.19.238. Here is the full test log link [1].
Quoted 15 lines
Quoted 7 lines
[ 0.000000] Booting Linux on physical CPU 0x0000000100 [0x410fd033] [ 0.000000] Linux version 4.19.238 (tuxmake@tuxmake) (gcc version 11.2.0 (Debian 11.2.0-18)) #1 SMP PREEMPT @1650206156 [ 0.000000] Machine model: ARM Juno development board (r2) <trim> [ 18.499895] ================================ [ 18.504172] WARNING: inconsistent lock stateQuoted 8 lines
[ 18.508451] 4.19.238 #1 Not tainted [ 18.511944] -------------------------------- [ 18.516222] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. [ 18.522242] kworker/u12:3/60 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 18.527826] (____ptrval____) (&(&xprt->transport_lock)->rlock){+.?.}, at: xprt_destroy+0x70/0xe0 [ 18.536648] {IN-SOFTIRQ-W} state was registered at: [ 18.541543] lock_acquire+0xc8/0x23cQuoted 3 lines
Prior to Linux 5.3, ->transport_lock needs
spin_lock_bh()andspin_unlock_bh().We get the same deadlock or similar one and we think that can be connected to this thread on 4.19.243. For us is a bit difficult to hit but we are going to apply this change
net: sunrpc: Fix deadlock in
xprt_destroyPrior to Linux 5.3, ->transport_lock needs
spin_lock_bh()andspin_unlock_bh().Signed-off-by Michael Trimarchi <[email protected]>---
net/sunrpc/xprt.c| 4 ++--1 file changed, 2 insertions(+), 2 deletions(-)net/sunrpc/xprt.c +2
-2@@ -1550,9 +1550,9 @@ static void xprt_destroy(struct rpc_xprt *xprt)* is cleared. We use ->transport_lock to ensure the mod_timer() * can only run *before* del_time_sync(), never after. */ -spin_lock (&xprt->transport_lock); +spin_lock_bh (&xprt->transport_lock);del_timer_sync (&xprt->timer); -spin_unlock (&xprt->transport_lock); +spin_unlock_bh (&xprt->transport_lock);
Quoted 8 lines
Quoted 3 lines
net/sunrpc/xprt.c +0
-0/* * Destroy sockets etc from the system workqueue so they can —
Agreed. When backporting to kernels that are older than 5.3.x, the transport lock needs to be taken using the bh-safe spin lock variants.
Reviewed-by Trond Myklebust <[email protected] <mailto:[email protected]>>
Seems already applied, but for some reason I miss it. I will re-align to stable again
Michael
Quoted 5 lines
_________________________________
Trond Myklebust
Linux NFS client maintainer, Hammerspace
[email protected]
Signature · 11 lines
Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 [email protected] __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 [email protected] www.amarulasolutions.com