[PATCH 1/1] file capabilities: clear caps cleanup

From: Serge E . Hallyn
Date: Wed Jul 11 2007 - 10:01:01 EST


As suggested by Steve Beattie, rather than jump into a
conditional block in certain cases, define and use a
static inline bprm_clear_caps().

Signed-off-by: Serge E. Hallyn <serue@xxxxxxxxxx>
---
security/commoncap.c | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/security/commoncap.c b/security/commoncap.c
index cc50a61..b08d250 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -109,6 +109,13 @@ void cap_capset_set (struct task_struct *target, kernel_cap_t *effective,
target->cap_permitted = *permitted;
}

+static inline void bprm_clear_caps(struct linux_binprm *bprm)
+{
+ cap_clear (bprm->cap_inheritable);
+ cap_clear (bprm->cap_permitted);
+ cap_clear (bprm->cap_effective);
+}
+
#ifdef CONFIG_SECURITY_FILE_CAPABILITIES

static inline int cap_from_disk(struct vfs_cap_data_disk *dcap,
@@ -144,8 +151,10 @@ static int get_file_caps(struct linux_binprm *bprm)
struct inode *inode;

dcaps = (struct vfs_cap_data_disk *)&v1caps;
- if (bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID)
- goto clear_caps;
+ if (bprm->file->f_vfsmnt->mnt_flags & MNT_NOSUID) {
+ bprm_clear_caps(bprm);
+ return 0;
+ }

dentry = dget(bprm->file->f_dentry);
inode = dentry->d_inode;
@@ -186,21 +195,16 @@ out:
dput(dentry);
if ((void *)dcaps != (void *)&v1caps)
kfree(dcaps);
- if (rc) {
-clear_caps:
- cap_clear (bprm->cap_inheritable);
- cap_clear (bprm->cap_permitted);
- cap_clear (bprm->cap_effective);
- }
+ if (rc)
+ bprm_clear_caps(bprm);
+
return rc;
}

#else
static inline int get_file_caps(struct linux_binprm *bprm)
{
- cap_clear (bprm->cap_inheritable);
- cap_clear (bprm->cap_permitted);
- cap_clear (bprm->cap_effective);
+ bprm_clear_caps(bprm);
return 0;
}
#endif
--
1.5.1.1.GIT

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/