diff options
| author | Vlastimil Babka <vbabka@suse.cz> | 2024-09-13 11:13:03 +0200 |
|---|---|---|
| committer | Vlastimil Babka <vbabka@suse.cz> | 2024-09-13 11:13:03 +0200 |
| commit | ecc4d6af979b3bd4d239ff80bbba455c90d3f4f3 (patch) | |
| tree | f42df8888b5032a54a5bf80721435ae9a31137d5 /security | |
| parent | a715e94dbda4ece41aac49b7b7ff8ddb55a7fe08 (diff) | |
| parent | 4b7ff9ab98af11a477d50f08382bcc4c2f899926 (diff) | |
| download | linux-ecc4d6af979b3bd4d239ff80bbba455c90d3f4f3.tar.gz linux-ecc4d6af979b3bd4d239ff80bbba455c90d3f4f3.tar.bz2 linux-ecc4d6af979b3bd4d239ff80bbba455c90d3f4f3.zip | |
Merge branch 'slab/for-6.12/kmem_cache_args' into slab/for-next
Merge kmem_cache_create() refactoring by Christian Brauner.
Note this includes a merge of the vfs.file tree that contains the
prerequisity kmem_cache_create_rcu() work.
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 2 | ||||
| -rw-r--r-- | security/smack/smack_lsm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index bfa61e005aac..577e1fcbf6df 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -3950,7 +3950,7 @@ static int selinux_file_send_sigiotask(struct task_struct *tsk, struct file_security_struct *fsec; /* struct fown_struct is never outside the context of a struct file */ - file = container_of(fown, struct file, f_owner); + file = fown->file; fsec = selinux_file(file); diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c index 4164699cd4f6..cb33920ab67c 100644 --- a/security/smack/smack_lsm.c +++ b/security/smack/smack_lsm.c @@ -1950,7 +1950,7 @@ static int smack_file_send_sigiotask(struct task_struct *tsk, /* * struct fown_struct is never outside the context of a struct file */ - file = container_of(fown, struct file, f_owner); + file = fown->file; /* we don't log here as rc can be overriden */ blob = smack_file(file); |