Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 242738
b: refs/heads/master
c: 6213cfe
h: refs/heads/master
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed Mar 28, 2011
1 parent ee5bf2f commit 712d6c4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ae91dbfc9949cf042c45798557b48d3b83bc3635
refs/heads/master: 6213cfe82461e39219a3b06ecf1d0679b4c0657f
4 changes: 3 additions & 1 deletion trunk/ipc/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ static int ipcget_new(struct ipc_namespace *ns, struct ipc_ids *ids,

/**
* ipc_check_perms - check security and permissions for an IPC
* @ns: IPC namespace
* @ipcp: ipc permission set
* @ops: the actual security routine to call
* @params: its parameters
Expand Down Expand Up @@ -607,6 +608,7 @@ void ipc_rcu_putref(void *ptr)

/**
* ipcperms - check IPC permissions
* @ns: IPC namespace
* @ipcp: IPC permission set
* @flag: desired permission set.
*
Expand Down Expand Up @@ -769,7 +771,7 @@ void ipc_update_perm(struct ipc64_perm *in, struct kern_ipc_perm *out)

/**
* ipcctl_pre_down - retrieve an ipc and check permissions for some IPC_XXX cmd
* @ids: the ipc namespace
* @ns: the ipc namespace
* @ids: the table of ids where to look for the ipc
* @id: the id of the ipc to retrieve
* @cmd: the cmd to check
Expand Down

0 comments on commit 712d6c4

Please sign in to comment.