* [PATCH] capabilities: define get_vfs_caps_from_disk when file caps are not enabled
@ 2008-11-13 23:37 Eric Paris
2008-11-14 0:16 ` James Morris
0 siblings, 1 reply; 2+ messages in thread
From: Eric Paris @ 2008-11-13 23:37 UTC (permalink / raw)
To: jmorris; +Cc: linux-kernel, serue, morgan
When CONFIG_SECURITY_FILE_CAPABILITIES is not set the audit system may
try to call into the capabilities function vfs_cap_from_file. This
patch defines that function so kernels can build and work.
Signed-off-by: Eric Paris <eparis@redhat.com>
---
security/commoncap.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/security/commoncap.c b/security/commoncap.c
index 0b88160..574a70b 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -337,6 +337,12 @@ int cap_inode_killpriv(struct dentry *dentry)
return 0;
}
+int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps)
+{
+ memset(cpu_caps, 0, sizeof(struct cpu_vfs_cap_data));
+ return -ENODATA;
+}
+
static inline int get_file_caps(struct linux_binprm *bprm)
{
bprm_clear_caps(bprm);
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] capabilities: define get_vfs_caps_from_disk when file caps are not enabled
2008-11-13 23:37 [PATCH] capabilities: define get_vfs_caps_from_disk when file caps are not enabled Eric Paris
@ 2008-11-14 0:16 ` James Morris
0 siblings, 0 replies; 2+ messages in thread
From: James Morris @ 2008-11-14 0:16 UTC (permalink / raw)
To: Eric Paris; +Cc: linux-kernel, serue, morgan
On Thu, 13 Nov 2008, Eric Paris wrote:
> When CONFIG_SECURITY_FILE_CAPABILITIES is not set the audit system may
> try to call into the capabilities function vfs_cap_from_file. This
> patch defines that function so kernels can build and work.
>
> Signed-off-by: Eric Paris <eparis@redhat.com>
>
> ---
>
> security/commoncap.c | 6 ++++++
> 1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/security/commoncap.c b/security/commoncap.c
> index 0b88160..574a70b 100644
> --- a/security/commoncap.c
> +++ b/security/commoncap.c
> @@ -337,6 +337,12 @@ int cap_inode_killpriv(struct dentry *dentry)
> return 0;
> }
>
> +int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps)
> +{
> + memset(cpu_caps, 0, sizeof(struct cpu_vfs_cap_data));
> + return -ENODATA;
> +}
> +
As the function is returning an error, the caller should not depend on the
state of any modifiable arguments, so I suggest removing the memset.
> static inline int get_file_caps(struct linux_binprm *bprm)
> {
> bprm_clear_caps(bprm);
>
>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-11-14 0:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-11-13 23:37 [PATCH] capabilities: define get_vfs_caps_from_disk when file caps are not enabled Eric Paris
2008-11-14 0:16 ` James Morris
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®