renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-14 08:13:56 +08:00
Code

SUNRPC: Mask signals across the call to rpc_call_setup() in rpc_run_task

Browse Source 
To ensure that the RPCSEC_GSS upcall is performed with the correct sigmask.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2007-10-25 18:19:37 -04:00
parent 3ff7576dda
commit 5085925902
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/sunrpc/auth.c
View File

@ -385,6 +385,7 @@ rpcauth_bindcred(struct rpc_task *task)
.group_info = current->group_info, .group_info = current->group_info,
}; };
struct rpc_cred *ret; struct rpc_cred *ret;
sigset_t oldset;
int flags = 0; int flags = 0;
dprintk("RPC: %5u looking up %s cred\n", dprintk("RPC: %5u looking up %s cred\n",
@ -392,7 +393,9 @@ rpcauth_bindcred(struct rpc_task *task)
get_group_info(acred.group_info); get_group_info(acred.group_info);
if (task->tk_flags & RPC_TASK_ROOTCREDS) if (task->tk_flags & RPC_TASK_ROOTCREDS)
flags |= RPCAUTH_LOOKUP_ROOTCREDS; flags |= RPCAUTH_LOOKUP_ROOTCREDS;
rpc_clnt_sigmask(task->tk_client, &oldset);
ret = auth->au_ops->lookup_cred(auth, &acred, flags); ret = auth->au_ops->lookup_cred(auth, &acred, flags);
rpc_clnt_sigunmask(task->tk_client, &oldset);
if (!IS_ERR(ret)) if (!IS_ERR(ret))
task->tk_msg.rpc_cred = ret; task->tk_msg.rpc_cred = ret;
else else

13
net/sunrpc/clnt.c
View File

@ -501,12 +501,12 @@ static void rpc_save_sigmask(sigset_t *oldset, int intr)
sigprocmask(SIG_BLOCK, &sigmask, oldset); sigprocmask(SIG_BLOCK, &sigmask, oldset);
} }
static inline void rpc_task_sigmask(struct rpc_task *task, sigset_t *oldset) static void rpc_task_sigmask(struct rpc_task *task, sigset_t *oldset)
{ {
rpc_save_sigmask(oldset, !RPC_TASK_UNINTERRUPTIBLE(task)); rpc_save_sigmask(oldset, !RPC_TASK_UNINTERRUPTIBLE(task));
} }
static inline void rpc_restore_sigmask(sigset_t *oldset) static void rpc_restore_sigmask(sigset_t *oldset)
{ {
sigprocmask(SIG_SETMASK, oldset, NULL); sigprocmask(SIG_SETMASK, oldset, NULL);
} }
@ -536,11 +536,10 @@ struct rpc_task *rpc_run_task(const struct rpc_task_setup *task_setup_data)
if (task == NULL) { if (task == NULL) {
rpc_release_calldata(task_setup_data->callback_ops, rpc_release_calldata(task_setup_data->callback_ops,
task_setup_data->callback_data); task_setup_data->callback_data);
return ERR_PTR(-ENOMEM); ret = ERR_PTR(-ENOMEM);
goto out;
} }
/* Mask signals on synchronous RPC calls and RPCSEC_GSS upcalls */
rpc_task_sigmask(task, &oldset);
if (task_setup_data->rpc_message != NULL) { if (task_setup_data->rpc_message != NULL) {
rpc_call_setup(task, task_setup_data->rpc_message, 0); rpc_call_setup(task, task_setup_data->rpc_message, 0);
if (task->tk_status != 0) { if (task->tk_status != 0) {
@ -550,10 +549,12 @@ struct rpc_task *rpc_run_task(const struct rpc_task_setup *task_setup_data)
} }
} }
atomic_inc(&task->tk_count); atomic_inc(&task->tk_count);
/* Mask signals on synchronous RPC calls and RPCSEC_GSS upcalls */
rpc_task_sigmask(task, &oldset);
rpc_execute(task); rpc_execute(task);
rpc_restore_sigmask(&oldset);
ret = task; ret = task;
out: out:
rpc_restore_sigmask(&oldset);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(rpc_run_task); EXPORT_SYMBOL_GPL(rpc_run_task);