umh && creds: convert call_usermodehelper_keys() to use subprocess_info->init()
Subsystems (4)
PATCH v2 1/2 umh && creds: convert call_usermodehelper_keys() to use subprocess_info->init()
call_usermodehelper_keys() uses call_usermodehelper_setkeys() to change subprocess_info->cred in advance. Now that we have info->init() we can change this code to set tgcred->session_keyring in context of execing kernel thread.
Note: since currently call_usermodehelper_keys() is never called with UMH_NO_WAIT, umh_keys_cleanup() is not really needed, we could just move key_get() from call_usermodehelper_keys() to umh_keys_init().
Compile tested.
---
include/linux/kmod.h | 17 ----------------- kernel/kmod.c | 18 ------------------ security/keys/request_key.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+), 35 deletions(-)
include/linux/kmod.h renamed from include/linux/kmod.h~1_CONVERT_KEYS +0 -17
@@ -71,8 +71,6 @@ struct subprocess_info *call_usermodehel char **envp, gfp_t gfp_mask);/* Set various pieces of state into the subprocess_info structure */ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring); void call_usermodehelper_setfns(struct subprocess_info *info, int (*init)(struct subprocess_info *info), void (*cleanup)(struct subprocess_info *info),
@@ -108,21 +106,6 @@ call_usermodehelper(char *path, char **a wait, NULL, NULL, NULL); } -static inline int -call_usermodehelper_keys (char *path,char **argv,char **envp, -struct key *session_keyring,enum umh_wait wait) -{ -struct subprocess_info *info; -gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; - - info =call_usermodehelper_setup (path, argv, envp, gfp_mask); -if (info ==NULL ) -return -ENOMEM ; - -call_usermodehelper_setkeys (info, session_keyring); -return call_usermodehelper_exec (info, wait); -} -extern void usermodehelper_init (void );extern int usermodehelper_disable (void );
kernel/kmod.c renamed from kernel/kmod.c~1_CONVERT_KEYS +0 -18
@@ -386,24 +386,6 @@ struct subprocess_info *call_usermodehelEXPORT_SYMBOL (call_usermodehelper_setup);/** -* call_usermodehelper_setkeys - set the session keys for usermode helper -* @info: a subprocess_info returned by call_usermodehelper_setup -* @session_keyring: the session keyring for the process -*/ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring) -{ -#ifdef CONFIG_KEYS -struct thread_group_cred *tgcred = info->cred->tgcred; -key_put (tgcred->session_keyring); - tgcred->session_keyring =key_get (session_keyring); -#else -BUG (); -#endif -} -EXPORT_SYMBOL (call_usermodehelper_setkeys); - -/** * call_usermodehelper_setfns - set a cleanup/init function * @info: a subprocess_info returned by call_usermodehelper_setup * @cleanup: a cleanup function
security/keys/request_key.c renamed from security/keys/request_key.c~1_CONVERT_KEYS +37 -0
@@ -58,6 +58,43 @@ void complete_request_key(struct key_con }EXPORT_SYMBOL (complete_request_key); +static int umh_keys_init (struct subprocess_info *info) +{ +struct thread_group_cred *tgcred =current_cred ()->tgcred; +struct key *session_keyring = info->data; +/* +* This is called in context of freshly forked kthread before +* kernel_execve(), we can just change our ->session_keyring. +*/ +WARN_ON (tgcred->session_keyring); + tgcred->session_keyring = session_keyring; + + info->data =NULL ;/* for umh_keys_cleanup() */ +return 0 ; +} + +static void umh_keys_cleanup (struct subprocess_info *info) +{ +struct key *session_keyring = info->data; +key_put (session_keyring);/* NULL if successs */ +} + +static inline int +call_usermodehelper_keys (char *path,char **argv,char **envp, +struct key *session_keyring,enum umh_wait wait) +{ +gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; +struct subprocess_info *info = +call_usermodehelper_setup (path, argv, envp, gfp_mask); + +if (!info) +return -ENOMEM ; + +call_usermodehelper_setfns (info, umh_keys_init, umh_keys_cleanup, +key_get (session_keyring)); +return call_usermodehelper_exec (info, wait); +} +/* * request userspace finish the construction of a key * - execute "/sbin/request-key <op> <key> <uid> <gid> <keyring> <keyring> <keyring>"
David Howells
maintainersecurity/keys/request_key.c void complete_request_key(struct key_con · line 68
Quoted 4 lines · Oleg Nesterov
security/keys/request_key.c renamed from security/keys/request_key.c~1_CONVERT_KEYS +4
-0+/* +* This is called in context of freshly forked kthread before +* kernel_execve(), we can just change our ->session_keyring. +*/
Ummmm.... What gives you that idea?
You may be sharing init_cred...
You need to create, modify and commit a new set of creds.
David
Quoted 11 lines · David Howells
security/keys/request_key.c void complete_request_key(struct key_con · line 68
Quoted 4 lines · Oleg Nesterov
security/keys/request_key.c renamed from security/keys/request_key.c~1_CONVERT_KEYS +4
-0+/* +* This is called in context of freshly forked kthread before +* kernel_execve(), we can just change our ->session_keyring. +*/ Ummmm.... What gives you that idea?
You may be sharing
init_cred...
How? Without CLONE_THREAD copy_creds() always creates the new struct cred for the child?
Oleg.
David Howells
maintainerQuoted 2 lines · Oleg Nesterov
How? Without
CLONE_THREADcopy_creds()always creates the new struct cred for the child?
Okay, that's a good point.
In which case, you should be calling install_session_keyring_to_cred(), just so that the credentials installation is always done by the same piece of code.
David
Quoted 3 lines · David Howells
In which case, you should be calling
install_session_keyring_to_cred(), just so that the credentials installation is always done by the same piece of code.
OK, will redo and resend tomorrow, thanks.
Oleg.
v2 cover umh && creds: kill sub_info->cred
In reply to David HowellsChanges:
1/2: do not change ->session_keyring by hand, use install_session_keyring_to_cred() helper as David suggested. 2/2: unchanged
Andrew, this is on top of
kmod-replace-call_usermodehelper_pipe-with-use-of-umh-init-function-and-resolve-limit.patch
plus trivial
"[PATCH -mm] kmod-replace-call_usermodehelper_pipe-with-use-of-umh-init-function- and-resolve-limit.cleanup" http://marc.info/?l=linux-kernel&m=126711062108298
cleanup.
Oleg.
PATCH v2 1/2 umh && creds: convert call_usermodehelper_keys() to use subprocess_info->init()
call_usermodehelper_keys() uses call_usermodehelper_setkeys() to change subprocess_info->cred in advance. Now that we have info->init() we can change this code to set tgcred->session_keyring in context of execing kernel thread.
Note: since currently call_usermodehelper_keys() is never called with UMH_NO_WAIT, call_usermodehelper_keys()->key_get() and umh_keys_cleanup() are not really needed, we could rely on install_session_keyring_to_cred() which does key_get() on success.
Compile tested.
---
include/linux/kmod.h | 17 ----------------- kernel/kmod.c | 18 ------------------ security/keys/internal.h | 1 + security/keys/process_keys.c | 3 +-- security/keys/request_key.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 35 insertions(+), 37 deletions(-)
include/linux/kmod.h renamed from include/linux/kmod.h~1_CONVERT_KEYS +0 -17
@@ -71,8 +71,6 @@ struct subprocess_info *call_usermodehel char **envp, gfp_t gfp_mask);/* Set various pieces of state into the subprocess_info structure */ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring); void call_usermodehelper_setfns(struct subprocess_info *info, int (*init)(struct subprocess_info *info), void (*cleanup)(struct subprocess_info *info),
@@ -108,21 +106,6 @@ call_usermodehelper(char *path, char **a wait, NULL, NULL, NULL); } -static inline int -call_usermodehelper_keys (char *path,char **argv,char **envp, -struct key *session_keyring,enum umh_wait wait) -{ -struct subprocess_info *info; -gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; - - info =call_usermodehelper_setup (path, argv, envp, gfp_mask); -if (info ==NULL ) -return -ENOMEM ; - -call_usermodehelper_setkeys (info, session_keyring); -return call_usermodehelper_exec (info, wait); -} -extern void usermodehelper_init (void );extern int usermodehelper_disable (void );
kernel/kmod.c renamed from kernel/kmod.c~1_CONVERT_KEYS +0 -18
@@ -386,24 +386,6 @@ struct subprocess_info *call_usermodehelEXPORT_SYMBOL (call_usermodehelper_setup);/** -* call_usermodehelper_setkeys - set the session keys for usermode helper -* @info: a subprocess_info returned by call_usermodehelper_setup -* @session_keyring: the session keyring for the process -*/ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring) -{ -#ifdef CONFIG_KEYS -struct thread_group_cred *tgcred = info->cred->tgcred; -key_put (tgcred->session_keyring); - tgcred->session_keyring =key_get (session_keyring); -#else -BUG (); -#endif -} -EXPORT_SYMBOL (call_usermodehelper_setkeys); - -/** * call_usermodehelper_setfns - set a cleanup/init function * @info: a subprocess_info returned by call_usermodehelper_setup * @cleanup: a cleanup function
security/keys/internal.h renamed from security/keys/internal.h~1_CONVERT_KEYS +1 -0
@@ -115,6 +115,7 @@ extern struct key *find_keyring_by_name(extern int install_user_keyrings (void );extern int install_thread_keyring_to_cred (struct cred *);extern int install_process_keyring_to_cred (struct cred *); +extern int install_session_keyring_to_cred (struct cred *,struct key *); extern struct key *request_key_and_link(struct key_type *type, const char *description,
security/keys/process_keys.c renamed from security/keys/process_keys.c~1_CONVERT_KEYS +1 -2
@@ -217,8 +217,7 @@ static int install_process_keyring(void)/* * install a session keyring directly to a credentials struct */ -static int install_session_keyring_to_cred (struct cred *cred, -struct key *keyring) +int install_session_keyring_to_cred (struct cred *cred,struct key *keyring) {unsigned long flags;struct key *old;
security/keys/request_key.c renamed from security/keys/request_key.c~1_CONVERT_KEYS +33 -0
@@ -58,6 +58,39 @@ void complete_request_key(struct key_con }EXPORT_SYMBOL (complete_request_key); +static int umh_keys_init (struct subprocess_info *info) +{ +struct cred *cred = (struct cred *)current_cred (); +struct key *keyring = info->data; +/* +* This is called in context of freshly forked kthread before +* kernel_execve(), we can just change our ->session_keyring. +*/ +return install_session_keyring_to_cred (cred, keyring); +} + +static void umh_keys_cleanup (struct subprocess_info *info) +{ +struct key *keyring = info->data; +key_put (keyring); +} + +static inline int +call_usermodehelper_keys (char *path,char **argv,char **envp, +struct key *session_keyring,enum umh_wait wait) +{ +gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; +struct subprocess_info *info = +call_usermodehelper_setup (path, argv, envp, gfp_mask); + +if (!info) +return -ENOMEM ; + +call_usermodehelper_setfns (info, umh_keys_init, umh_keys_cleanup, +key_get (session_keyring)); +return call_usermodehelper_exec (info, wait); +} +/* * request userspace finish the construction of a key * - execute "/sbin/request-key <op> <key> <uid> <gid> <keyring> <keyring> <keyring>"
Quoted 5 lines · Oleg Nesterov
call_usermodehelper_keys()usescall_usermodehelper_setkeys()to changesubprocess_info->credin advance. Now that we haveinfo->init()we can change this code to settgcred->session_keyringin context of execing kernel thread.
Quoted 8 lines
Note: since currently
call_usermodehelper_keys()is never called withUMH_NO_WAIT, call_usermodehelper_keys()->key_get() andumh_keys_cleanup()are not really needed, we could rely oninstall_session_keyring_to_cred()which doeskey_get()on success.Compile tested.
Signed-off-by Oleg Nesterov <[email protected]>
David Howells
maintainersecurity/keys/request_key.c void complete_request_key(struct key_con · line 80
Quoted 3 lines · Oleg Nesterov
security/keys/request_key.c renamed from security/keys/request_key.c~1_CONVERT_KEYS +3
-0+static inline int +call_usermodehelper_keys (char *path,char **argv,char **envp, +struct key *session_keyring,enum umh_wait wait)
You should get rid of the inline there. I think it's okay otherwise.
David
Oleg Nesterov
Acked-by Neil HormanQuoted 8 lines · David Howells
Review
Quoted 3 lines · Oleg Nesterov
(quoted diff) +3
-0+static inline int +call_usermodehelper_keys(char *path, char **argv, char **envp, + struct key *session_keyring, enum umh_wait wait)You should get rid of the inline there. I think it's okay otherwise.
OK, please find v3 below.
(Neil, I retained your ack, hopefully you won't object...)
------------------------------------------------------------------------------
[PATCH v3 -mm 1/2] umh && creds: convert call_usermodehelper_keys() to use subprocess_info->init()
call_usermodehelper_keys() uses call_usermodehelper_setkeys() to change subprocess_info->cred in advance. Now that we have info->init() we can change this code to set tgcred->session_keyring in context of execing kernel thread.
Note: since currently call_usermodehelper_keys() is never called with UMH_NO_WAIT, call_usermodehelper_keys()->key_get() and umh_keys_cleanup() are not really needed, we could rely on install_session_keyring_to_cred() which does key_get() on success.
Compile tested.
---
include/linux/kmod.h | 17 ----------------- kernel/kmod.c | 18 ------------------ security/keys/internal.h | 1 + security/keys/process_keys.c | 3 +-- security/keys/request_key.c | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 37 deletions(-)
include/linux/kmod.h renamed from include/linux/kmod.h~1_CONVERT_KEYS +0 -17
@@ -71,8 +71,6 @@ struct subprocess_info *call_usermodehel char **envp, gfp_t gfp_mask);/* Set various pieces of state into the subprocess_info structure */ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring); void call_usermodehelper_setfns(struct subprocess_info *info, int (*init)(struct subprocess_info *info), void (*cleanup)(struct subprocess_info *info),
@@ -108,21 +106,6 @@ call_usermodehelper(char *path, char **a wait, NULL, NULL, NULL); } -static inline int -call_usermodehelper_keys (char *path,char **argv,char **envp, -struct key *session_keyring,enum umh_wait wait) -{ -struct subprocess_info *info; -gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; - - info =call_usermodehelper_setup (path, argv, envp, gfp_mask); -if (info ==NULL ) -return -ENOMEM ; - -call_usermodehelper_setkeys (info, session_keyring); -return call_usermodehelper_exec (info, wait); -} -extern void usermodehelper_init (void );extern int usermodehelper_disable (void );
kernel/kmod.c renamed from kernel/kmod.c~1_CONVERT_KEYS +0 -18
@@ -386,24 +386,6 @@ struct subprocess_info *call_usermodehelEXPORT_SYMBOL (call_usermodehelper_setup);/** -* call_usermodehelper_setkeys - set the session keys for usermode helper -* @info: a subprocess_info returned by call_usermodehelper_setup -* @session_keyring: the session keyring for the process -*/ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring) -{ -#ifdef CONFIG_KEYS -struct thread_group_cred *tgcred = info->cred->tgcred; -key_put (tgcred->session_keyring); - tgcred->session_keyring =key_get (session_keyring); -#else -BUG (); -#endif -} -EXPORT_SYMBOL (call_usermodehelper_setkeys); - -/** * call_usermodehelper_setfns - set a cleanup/init function * @info: a subprocess_info returned by call_usermodehelper_setup * @cleanup: a cleanup function
security/keys/internal.h renamed from security/keys/internal.h~1_CONVERT_KEYS +1 -0
@@ -115,6 +115,7 @@ extern struct key *find_keyring_by_name(extern int install_user_keyrings (void );extern int install_thread_keyring_to_cred (struct cred *);extern int install_process_keyring_to_cred (struct cred *); +extern int install_session_keyring_to_cred (struct cred *,struct key *); extern struct key *request_key_and_link(struct key_type *type, const char *description,
security/keys/process_keys.c renamed from security/keys/process_keys.c~1_CONVERT_KEYS +1 -2
@@ -217,8 +217,7 @@ static int install_process_keyring(void)/* * install a session keyring directly to a credentials struct */ -static int install_session_keyring_to_cred (struct cred *cred, -struct key *keyring) +int install_session_keyring_to_cred (struct cred *cred,struct key *keyring) {unsigned long flags;struct key *old;
security/keys/request_key.c renamed from security/keys/request_key.c~1_CONVERT_KEYS +32 -0
@@ -58,6 +58,38 @@ void complete_request_key(struct key_con }EXPORT_SYMBOL (complete_request_key); +static int umh_keys_init (struct subprocess_info *info) +{ +struct cred *cred = (struct cred *)current_cred (); +struct key *keyring = info->data; +/* +* This is called in context of freshly forked kthread before +* kernel_execve(), we can just change our ->session_keyring. +*/ +return install_session_keyring_to_cred (cred, keyring); +} + +static void umh_keys_cleanup (struct subprocess_info *info) +{ +struct key *keyring = info->data; +key_put (keyring); +} + +static int call_usermodehelper_keys (char *path,char **argv,char **envp, +struct key *session_keyring,enum umh_wait wait) +{ +gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; +struct subprocess_info *info = +call_usermodehelper_setup (path, argv, envp, gfp_mask); + +if (!info) +return -ENOMEM ; + +call_usermodehelper_setfns (info, umh_keys_init, umh_keys_cleanup, +key_get (session_keyring)); +return call_usermodehelper_exec (info, wait); +} +/* * request userspace finish the construction of a key * - execute "/sbin/request-key <op> <key> <uid> <gid> <keyring> <keyring> <keyring>"
David Howells
maintainerI'm not going to be able to test it before I get back from skiing in a week's time, but it looks ackable otherwise.
It can be tested by doing something like this:
[root@andromeda ~]# keyctl request2 user debug:a b @s 102880396 [root@andromeda ~]# keyctl show Session Keyring -3 --alswrv 0 0 keyring: _ses 404996112 --alswrv 0 -1 \_ keyring: _uid.0 102880396 --alswrv 0 0 \_ user: debug:a [root@andromeda ~]# keyctl print 102880396 Debug b
On a system with the keyutils package installed.
David
Quoted 16 lines · David Howells
I'm not going to be able to test it before I get back from skiing in a week's time, but it looks ackable otherwise.
It can be tested by doing something like this:
[root@andromeda ~]# keyctl request2 user debug:a b @s 102880396 [root@andromeda ~]# keyctl show Session Keyring -3 --alswrv 0 0 keyring: _ses 404996112 --alswrv 0 -1 \_ keyring: _uid.0 102880396 --alswrv 0 0 \_ user: debug:a [root@andromeda ~]# keyctl print 102880396 Debug b
Quoted 1 line
On a system with the keyutils package installed.
Thanks David.
Finally I reserved the machine for the testing,
[root@hp-dl360-01 ~]# keyctl request2 user debug:a b @s 623133085 [root@hp-dl360-01 ~]# keyctl show Session Keyring -3 --alswrv 0 0 keyring: _ses 845914766 --alswrv 0 -1 \_ keyring: _uid.0 623133085 --alswrv 0 0 \_ user: debug:a [root@hp-dl360-01 ~]# keyctl print 623133085 Debug b
Hopefully this all is right.
Oleg.
PATCH RESEND v2 1/2 umh && creds: convert call_usermodehelper_keys() to use subprocess_info->init()
(on top of kmod-replace-call_usermodehelper_pipe-with-use-of-umh-init-function-and-resolve-limit.patch)
call_usermodehelper_keys() uses call_usermodehelper_setkeys() to change subprocess_info->cred in advance. Now that we have info->init() we can change this code to set tgcred->session_keyring in context of execing kernel thread.
Note: since currently call_usermodehelper_keys() is never called with UMH_NO_WAIT, call_usermodehelper_keys()->key_get() and umh_keys_cleanup() are not really needed, we could rely on install_session_keyring_to_cred() which does key_get() on success.
---
include/linux/kmod.h | 17 ----------------- kernel/kmod.c | 18 ------------------ security/keys/internal.h | 1 + security/keys/process_keys.c | 3 +-- security/keys/request_key.c | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 37 deletions(-)
include/linux/kmod.h renamed from include/linux/kmod.h~1_CONVERT_KEYS +0 -17
@@ -71,8 +71,6 @@ struct subprocess_info *call_usermodehel char **envp, gfp_t gfp_mask);/* Set various pieces of state into the subprocess_info structure */ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring); void call_usermodehelper_setfns(struct subprocess_info *info, int (*init)(struct subprocess_info *info), void (*cleanup)(struct subprocess_info *info),
@@ -108,21 +106,6 @@ call_usermodehelper(char *path, char **a wait, NULL, NULL, NULL); } -static inline int -call_usermodehelper_keys (char *path,char **argv,char **envp, -struct key *session_keyring,enum umh_wait wait) -{ -struct subprocess_info *info; -gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; - - info =call_usermodehelper_setup (path, argv, envp, gfp_mask); -if (info ==NULL ) -return -ENOMEM ; - -call_usermodehelper_setkeys (info, session_keyring); -return call_usermodehelper_exec (info, wait); -} -extern void usermodehelper_init (void );extern int usermodehelper_disable (void );
kernel/kmod.c renamed from kernel/kmod.c~1_CONVERT_KEYS +0 -18
@@ -386,24 +386,6 @@ struct subprocess_info *call_usermodehelEXPORT_SYMBOL (call_usermodehelper_setup);/** -* call_usermodehelper_setkeys - set the session keys for usermode helper -* @info: a subprocess_info returned by call_usermodehelper_setup -* @session_keyring: the session keyring for the process -*/ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring) -{ -#ifdef CONFIG_KEYS -struct thread_group_cred *tgcred = info->cred->tgcred; -key_put (tgcred->session_keyring); - tgcred->session_keyring =key_get (session_keyring); -#else -BUG (); -#endif -} -EXPORT_SYMBOL (call_usermodehelper_setkeys); - -/** * call_usermodehelper_setfns - set a cleanup/init function * @info: a subprocess_info returned by call_usermodehelper_setup * @cleanup: a cleanup function
security/keys/internal.h renamed from security/keys/internal.h~1_CONVERT_KEYS +1 -0
@@ -115,6 +115,7 @@ extern struct key *find_keyring_by_name(extern int install_user_keyrings (void );extern int install_thread_keyring_to_cred (struct cred *);extern int install_process_keyring_to_cred (struct cred *); +extern int install_session_keyring_to_cred (struct cred *,struct key *); extern struct key *request_key_and_link(struct key_type *type, const char *description,
security/keys/process_keys.c renamed from security/keys/process_keys.c~1_CONVERT_KEYS +1 -2
@@ -217,8 +217,7 @@ static int install_process_keyring(void)/* * install a session keyring directly to a credentials struct */ -static int install_session_keyring_to_cred (struct cred *cred, -struct key *keyring) +int install_session_keyring_to_cred (struct cred *cred,struct key *keyring) {unsigned long flags;struct key *old;
security/keys/request_key.c renamed from security/keys/request_key.c~1_CONVERT_KEYS +32 -0
@@ -58,6 +58,38 @@ void complete_request_key(struct key_con }EXPORT_SYMBOL (complete_request_key); +static int umh_keys_init (struct subprocess_info *info) +{ +struct cred *cred = (struct cred *)current_cred (); +struct key *keyring = info->data; +/* +* This is called in context of freshly forked kthread before +* kernel_execve(), we can just change our ->session_keyring. +*/ +return install_session_keyring_to_cred (cred, keyring); +} + +static void umh_keys_cleanup (struct subprocess_info *info) +{ +struct key *keyring = info->data; +key_put (keyring); +} + +static int call_usermodehelper_keys (char *path,char **argv,char **envp, +struct key *session_keyring,enum umh_wait wait) +{ +gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; +struct subprocess_info *info = +call_usermodehelper_setup (path, argv, envp, gfp_mask); + +if (!info) +return -ENOMEM ; + +call_usermodehelper_setfns (info, umh_keys_init, umh_keys_cleanup, +key_get (session_keyring)); +return call_usermodehelper_exec (info, wait); +} +/* * request userspace finish the construction of a key * - execute "/sbin/request-key <op> <key> <uid> <gid> <keyring> <keyring> <keyring>"
Quoted 7 lines · Oleg Nesterov
(on top of kmod-replace-call_usermodehelper_pipe-with-use-of-umh-init-function-and-resolve-limit.patch)
call_usermodehelper_keys()usescall_usermodehelper_setkeys()to changesubprocess_info->credin advance. Now that we haveinfo->init()we can change this code to settgcred->session_keyringin context of execing kernel thread.
Quoted 7 lines
Note: since currently
call_usermodehelper_keys()is never called withUMH_NO_WAIT, call_usermodehelper_keys()->key_get() andumh_keys_cleanup()are not really needed, we could rely oninstall_session_keyring_to_cred()which doeskey_get()on success.Signed-off-by Oleg Nesterov <[email protected]>Acked-by Neil Horman <[email protected]>
Quoted 7 lines · Oleg Nesterov
(on top of kmod-replace-call_usermodehelper_pipe-with-use-of-umh-init-function-and-resolve-limit.patch)
call_usermodehelper_keys()usescall_usermodehelper_setkeys()to changesubprocess_info->credin advance. Now that we haveinfo->init()we can change this code to settgcred->session_keyringin context of execing kernel thread.
Quoted 9 lines
Note: since currently
call_usermodehelper_keys()is never called withUMH_NO_WAIT, call_usermodehelper_keys()->key_get() andumh_keys_cleanup()are not really needed, we could rely oninstall_session_keyring_to_cred()which doeskey_get()on success.Signed-off-by Oleg Nesterov <[email protected]>Acked-by Neil Horman <[email protected]>---
Quoted 132 lines
include/linux/kmod.h | 17 ----------------- kernel/kmod.c | 18 ------------------ security/keys/internal.h | 1 + security/keys/process_keys.c | 3 +-- security/keys/request_key.c | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 37 deletions(-)include/linux/kmod.h renamed from include/linux/kmod.h~1_CONVERT_KEYS +0
-17@@ -71,8 +71,6 @@ struct subprocess_info *call_usermodehel char **envp, gfp_t gfp_mask);/* Set various pieces of state into the subprocess_info structure */ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring); void call_usermodehelper_setfns(struct subprocess_info *info, int (*init)(struct subprocess_info *info), void (*cleanup)(struct subprocess_info *info),@@ -108,21 +106,6 @@ call_usermodehelper(char *path, char **a wait, NULL, NULL, NULL); } -static inline int -call_usermodehelper_keys (char *path,char **argv,char **envp, -struct key *session_keyring,enum umh_wait wait) -{ -struct subprocess_info *info; -gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; - - info =call_usermodehelper_setup (path, argv, envp, gfp_mask); -if (info ==NULL ) -return -ENOMEM ; - -call_usermodehelper_setkeys (info, session_keyring); -return call_usermodehelper_exec (info, wait); -} -extern void usermodehelper_init (void );extern int usermodehelper_disable (void );kernel/kmod.c renamed from kernel/kmod.c~1_CONVERT_KEYS +0
-18@@ -386,24 +386,6 @@ struct subprocess_info *call_usermodehelEXPORT_SYMBOL (call_usermodehelper_setup);/** -* call_usermodehelper_setkeys - set the session keys for usermode helper -* @info: a subprocess_info returned by call_usermodehelper_setup -* @session_keyring: the session keyring for the process -*/ -void call_usermodehelper_setkeys (struct subprocess_info *info, -struct key *session_keyring) -{ -#ifdef CONFIG_KEYS -struct thread_group_cred *tgcred = info->cred->tgcred; -key_put (tgcred->session_keyring); - tgcred->session_keyring =key_get (session_keyring); -#else -BUG (); -#endif -} -EXPORT_SYMBOL (call_usermodehelper_setkeys); - -/** * call_usermodehelper_setfns - set a cleanup/init function * @info: a subprocess_info returned by call_usermodehelper_setup * @cleanup: a cleanup function security/keys/internal.h renamed from security/keys/internal.h~1_CONVERT_KEYS +1
-0@@ -115,6 +115,7 @@ extern struct key *find_keyring_by_name(extern int install_user_keyrings (void );extern int install_thread_keyring_to_cred (struct cred *);extern int install_process_keyring_to_cred (struct cred *); +extern int install_session_keyring_to_cred (struct cred *,struct key *); extern struct key *request_key_and_link(struct key_type *type, const char *description,security/keys/process_keys.c renamed from security/keys/process_keys.c~1_CONVERT_KEYS +1
-2@@ -217,8 +217,7 @@ static int install_process_keyring(void)/* * install a session keyring directly to a credentials struct */ -static int install_session_keyring_to_cred (struct cred *cred, -struct key *keyring) +int install_session_keyring_to_cred (struct cred *cred,struct key *keyring) {unsigned long flags;struct key *old;security/keys/request_key.c renamed from security/keys/request_key.c~1_CONVERT_KEYS +32
-0@@ -58,6 +58,38 @@ void complete_request_key(struct key_con }EXPORT_SYMBOL (complete_request_key); +static int umh_keys_init (struct subprocess_info *info) +{ +struct cred *cred = (struct cred *)current_cred (); +struct key *keyring = info->data; +/* +* This is called in context of freshly forked kthread before +* kernel_execve(), we can just change our ->session_keyring. +*/ +return install_session_keyring_to_cred (cred, keyring); +} + +static void umh_keys_cleanup (struct subprocess_info *info) +{ +struct key *keyring = info->data; +key_put (keyring); +} + +static int call_usermodehelper_keys (char *path,char **argv,char **envp, +struct key *session_keyring,enum umh_wait wait) +{ +gfp_t gfp_mask = (wait ==UMH_NO_WAIT ) ?GFP_ATOMIC :GFP_KERNEL ; +struct subprocess_info *info = +call_usermodehelper_setup (path, argv, envp, gfp_mask); + +if (!info) +return -ENOMEM ; + +call_usermodehelper_setfns (info, umh_keys_init, umh_keys_cleanup, +key_get (session_keyring)); +return call_usermodehelper_exec (info, wait); +} +/* * request userspace finish the construction of a key * - execute "/sbin/request-key <op> <key> <uid> <gid> <keyring> <keyring> <keyring>"
PATCH RESEND v2 2/2 umh && creds: kill subprocess_info->cred logic
In reply to Oleg NesterovNow that nobody ever changes subprocess_info->cred we can kill this member and related code. ____call_usermodehelper() always runs in the context of freshly forked kernel thread, it has the proper ->cred copied from its parent kthread, keventd.
---
include/linux/cred.h | 1 include/linux/kmod.h | 1 kernel/cred.c | 54 --------------------------------------------------- kernel/kmod.c | 19 ----------------- 4 files changed, 75 deletions(-)
include/linux/cred.h renamed from include/linux/cred.h~2_KILL_INFO_CRED +0 -1
@@ -156,7 +156,6 @@ extern int copy_creds(struct task_structextern struct cred *cred_alloc_blank (void );extern struct cred *prepare_creds (void );extern struct cred *prepare_exec_creds (void ); -extern struct cred *prepare_usermodehelper_creds (void );extern int commit_creds (struct cred *);extern void abort_creds (struct cred *);extern const struct cred *override_creds (const struct cred *);
include/linux/kmod.h renamed from include/linux/kmod.h~2_KILL_INFO_CRED +0 -1
@@ -55,7 +55,6 @@ enum umh_wait {struct subprocess_info {struct work_struct work;struct completion *complete; -struct cred *cred;char *path;char **argv;char **envp;
kernel/cred.c renamed from kernel/cred.c~2_KILL_INFO_CRED +0 -54
60 lines not on this page · raw message
kernel/kmod.c renamed from kernel/kmod.c~2_KILL_INFO_CRED +0 -19
@@ -153,8 +153,6 @@ static int ____call_usermodehelper(voidstruct subprocess_info *sub_info = data;int retval; -BUG_ON (atomic_read (&sub_info->cred->usage) !=1 ); -/* Unblock all signals */ spin_lock_irq (¤t->sighand->siglock);flush_signal_handlers (current,1 );
@@ -162,10 +160,6 @@ static int ____call_usermodehelper(voidrecalc_sigpending ();spin_unlock_irq (¤t->sighand->siglock); -/* Install the credentials */ -commit_creds (sub_info->cred); - sub_info->cred =NULL ; -/* We can run anywhere, unlike our parent keventd(). */ set_cpus_allowed_ptr (current, cpu_all_mask);
@@ -193,8 +187,6 @@ void call_usermodehelper_freeinfo(struct {if (info->cleanup) (*info->cleanup)(info); -if (info->cred) -put_cred (info->cred);kfree (info); }EXPORT_SYMBOL (call_usermodehelper_freeinfo);
@@ -250,8 +242,6 @@ static void __call_usermodehelper(structpid_t pid;enum umh_wait wait = sub_info->wait; -BUG_ON (atomic_read (&sub_info->cred->usage) !=1 ); -/* CLONE_VFORK: wait until the usermode helper has execve'd * successfully We need the data structures to stay around * until that is done. */
@@ -374,12 +364,6 @@ struct subprocess_info *call_usermodehel sub_info->path = path; sub_info->argv = argv; sub_info->envp = envp; - sub_info->cred =prepare_usermodehelper_creds (); -if (!sub_info->cred) { -kfree (sub_info); -return NULL ; - } - out:return sub_info; }
@@ -430,9 +414,6 @@ int call_usermodehelper_exec(struct subpDECLARE_COMPLETION_ONSTACK (done);int retval =0 ; -BUG_ON (atomic_read (&sub_info->cred->usage) !=1 ); -validate_creds (sub_info->cred); -helper_lock ();if (sub_info->path[0 ] =='\0' ) goto out;
Re: [PATCH,RESEND -mm 2/2] umh && creds: kill subprocess_info->cred logic
Quoted 7 lines · Oleg Nesterov
Now that nobody ever changes
subprocess_info->credwe can kill this member and related code.____call_usermodehelper()always runs in the context of freshly forked kernel thread, it has the proper ->cred copied from its parent kthread, keventd.Signed-off-by Oleg Nesterov <[email protected]>Acked-by Neil Horman <[email protected]>
Re: [PATCH,RESEND -mm 2/2] umh && creds: kill subprocess_info->cred logic
In reply to Oleg NesterovQuoted 9 lines · Oleg Nesterov
Now that nobody ever changes
subprocess_info->credwe can kill this member and related code.____call_usermodehelper()always runs in the context of freshly forked kernel thread, it has the proper ->cred copied from its parent kthread, keventd.Signed-off-by Oleg Nesterov <[email protected]>Acked-by Neil Horman <[email protected]>---
Quoted 1 line
PATCH v2 2/2 umh && creds: kill subprocess_info->cred logic
In reply to Oleg NesterovNow that nobody ever changes subprocess_info->cred we can kill this member and related code. ____call_usermodehelper() always runs in the context of freshly forked kernel thread, it has the proper ->cred copied from its parent kthread, keventd.
---
include/linux/cred.h | 1 include/linux/kmod.h | 1 kernel/cred.c | 54 --------------------------------------------------- kernel/kmod.c | 19 ----------------- 4 files changed, 75 deletions(-)
include/linux/cred.h renamed from include/linux/cred.h~2_KILL_INFO_CRED +0 -1
@@ -156,7 +156,6 @@ extern int copy_creds(struct task_structextern struct cred *cred_alloc_blank (void );extern struct cred *prepare_creds (void );extern struct cred *prepare_exec_creds (void ); -extern struct cred *prepare_usermodehelper_creds (void );extern int commit_creds (struct cred *);extern void abort_creds (struct cred *);extern const struct cred *override_creds (const struct cred *);
include/linux/kmod.h renamed from include/linux/kmod.h~2_KILL_INFO_CRED +0 -1
@@ -55,7 +55,6 @@ enum umh_wait {struct subprocess_info {struct work_struct work;struct completion *complete; -struct cred *cred;char *path;char **argv;char **envp;
kernel/cred.c renamed from kernel/cred.c~2_KILL_INFO_CRED +0 -54
60 lines not on this page · raw message
kernel/kmod.c renamed from kernel/kmod.c~2_KILL_INFO_CRED +0 -19
@@ -153,8 +153,6 @@ static int ____call_usermodehelper(voidstruct subprocess_info *sub_info = data;int retval; -BUG_ON (atomic_read (&sub_info->cred->usage) !=1 ); -/* Unblock all signals */ spin_lock_irq (¤t->sighand->siglock);flush_signal_handlers (current,1 );
@@ -162,10 +160,6 @@ static int ____call_usermodehelper(voidrecalc_sigpending ();spin_unlock_irq (¤t->sighand->siglock); -/* Install the credentials */ -commit_creds (sub_info->cred); - sub_info->cred =NULL ; -/* We can run anywhere, unlike our parent keventd(). */ set_cpus_allowed_ptr (current, cpu_all_mask);
@@ -193,8 +187,6 @@ void call_usermodehelper_freeinfo(struct {if (info->cleanup) (*info->cleanup)(info); -if (info->cred) -put_cred (info->cred);kfree (info); }EXPORT_SYMBOL (call_usermodehelper_freeinfo);
@@ -250,8 +242,6 @@ static void __call_usermodehelper(structpid_t pid;enum umh_wait wait = sub_info->wait; -BUG_ON (atomic_read (&sub_info->cred->usage) !=1 ); -/* CLONE_VFORK: wait until the usermode helper has execve'd * successfully We need the data structures to stay around * until that is done. */
@@ -374,12 +364,6 @@ struct subprocess_info *call_usermodehel sub_info->path = path; sub_info->argv = argv; sub_info->envp = envp; - sub_info->cred =prepare_usermodehelper_creds (); -if (!sub_info->cred) { -kfree (sub_info); -return NULL ; - } - out:return sub_info; }
@@ -430,9 +414,6 @@ int call_usermodehelper_exec(struct subpDECLARE_COMPLETION_ONSTACK (done);int retval =0 ; -BUG_ON (atomic_read (&sub_info->cred->usage) !=1 ); -validate_creds (sub_info->cred); -helper_lock ();if (sub_info->path[0 ] =='\0' ) goto out;
Re: [PATCH v2 -mm 2/2] umh && creds: kill subprocess_info->cred logic
Quoted 6 lines · Oleg Nesterov
Now that nobody ever changes
subprocess_info->credwe can kill this member and related code.____call_usermodehelper()always runs in the context of freshly forked kernel thread, it has the proper ->cred copied from its parent kthread, keventd.Signed-off-by Oleg Nesterov <[email protected]>