Skip to content

Commit

Permalink
audit: rename the misleading audit_get_context() to audit_take_context()
Browse files Browse the repository at this point in the history
"get" usually implies incrementing a refcount into a structure to indicate a
reference being held by another part of code.

Change this function name to indicate it is in fact being taken from it,
returning the value while clearing it in the supplying structure.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
  • Loading branch information
Richard Guy Briggs authored and Eric Paris committed Mar 20, 2014
1 parent 4b58841 commit 4a3eb72
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions kernel/auditsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,8 @@ void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx)
rcu_read_unlock();
}

static inline struct audit_context *audit_get_context(struct task_struct *tsk,
/* Transfer the audit context pointer to the caller, clearing it in the tsk's struct */
static inline struct audit_context *audit_take_context(struct task_struct *tsk,
int return_valid,
long return_code)
{
Expand Down Expand Up @@ -1474,7 +1475,7 @@ void __audit_free(struct task_struct *tsk)
{
struct audit_context *context;

context = audit_get_context(tsk, 0, 0);
context = audit_take_context(tsk, 0, 0);
if (!context)
return;

Expand Down Expand Up @@ -1568,7 +1569,7 @@ void __audit_syscall_exit(int success, long return_code)
else
success = AUDITSC_FAILURE;

context = audit_get_context(tsk, success, return_code);
context = audit_take_context(tsk, success, return_code);
if (!context)
return;

Expand Down

0 comments on commit 4a3eb72

Please sign in to comment.