The patch titled security-filesystem-capabilities-fix-cap_setpcap-handling-fix has been removed from the -mm tree. Its filename was security-filesystem-capabilities-fix-cap_setpcap-handling-fix.patch This patch was dropped because it was folded into security-filesystem-capabilities-fix-cap_setpcap-handling.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: security-filesystem-capabilities-fix-cap_setpcap-handling-fix From: Andrew G. Morgan <morgan@xxxxxxxxxx> Within the kernel, ptraced is a more appropriate name. Reported-by: David Howells <dhowells@xxxxxxxxxx> Signed-off-by: Andrew G. Morgan <morgan@xxxxxxxxxx> Cc: "Serge E. Hallyn" <serue@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- security/commoncap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN security/commoncap.c~security-filesystem-capabilities-fix-cap_setpcap-handling-fix security/commoncap.c --- a/security/commoncap.c~security-filesystem-capabilities-fix-cap_setpcap-handling-fix +++ a/security/commoncap.c @@ -103,13 +103,13 @@ static inline int cap_inh_is_capped(void return (cap_capable(current, CAP_SETPCAP) != 0); } -static inline int cap_limit_straced_target(void) { return 1; } +static inline int cap_limit_ptraced_target(void) { return 1; } #else /* ie., ndef CONFIG_SECURITY_FILE_CAPABILITIES */ static inline int cap_block_setpcap(struct task_struct *t) { return 0; } static inline int cap_inh_is_capped(void) { return 1; } -static inline int cap_limit_straced_target(void) +static inline int cap_limit_ptraced_target(void) { return !capable(CAP_SETPCAP); } @@ -348,7 +348,7 @@ void cap_bprm_apply_creds (struct linux_ bprm->e_uid = current->uid; bprm->e_gid = current->gid; } - if (cap_limit_straced_target()) { + if (cap_limit_ptraced_target()) { new_permitted = cap_intersect(new_permitted, current->cap_permitted); _ Patches currently in -mm which might be from morgan@xxxxxxxxxx are security-filesystem-capabilities-fix-fragile-setuid-fixup-code.patch security-filesystem-capabilities-fix-cap_setpcap-handling.patch security-filesystem-capabilities-fix-cap_setpcap-handling-fix.patch security-protect-legacy-applications-from-executing-with-insufficient-privilege.patch security-protect-legacy-apps-from-insufficient-privilege-cleanup.patch security-protect-legacy-applications-from-executing-with-insufficient-privilege-checkpatch-fixes.patch security-filesystem-capabilities-refactor-kernel-code.patch security-filesystem-capabilities-no-longer-experimental.patch sysctl-allow-override-of-proc-sys-net-with-cap_net_admin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html