Hi James,
Today's linux-next merge of the security-testing tree got a conflict in
include/linux/capability.h between commit 47a150edc2ae ("Cache user_ns in
struct cred") from Linus' tree and commit ffa8e59df047 ("capabilities: do
not drop CAP_SETPCAP from the initial task") from the security-testing
tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc include/linux/capability.h
index d4675af,04fed72..0000000
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@@ -546,8 -541,21 +541,10 @@@ extern bool has_capability_noaudit(stru
extern bool capable(int cap);
extern bool ns_capable(struct user_namespace *ns, int cap);
extern bool task_ns_capable(struct task_struct *t, int cap);
+extern bool nsown_capable(int cap);
+ extern const kernel_cap_t __cap_empty_set;
+
-/**
- * nsown_capable - Check superior capability to one's own user_ns
- * @cap: The capability in question
- *
- * Return true if the current task has the given superior capability
- * targeted at its own user namespace.
- */
-static inline bool nsown_capable(int cap)
-{
- return ns_capable(current_user_ns(), cap);
-}
-
/* audit system wants to get cap info from files as well */
extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
