* [PATCH] audit: fix build error when disable audit
@ 2013-12-19 2:34 Gao feng
2013-12-19 2:40 ` Gao feng
0 siblings, 1 reply; 6+ messages in thread
From: Gao feng @ 2013-12-19 2:34 UTC (permalink / raw)
To: linux-audit; +Cc: linux-kernel, Gao feng
kernel/capability.c: In function ‘SYSC_capset’:
kernel/capability.c:280:2: warning: passing argument 1 of ‘audit_log_capset’ makes integer from pointer without a cast [enabled by default]
audit_log_capset(new, current_cred());
^
In file included from kernel/capability.c:10:0:
include/linux/audit.h:400:20: note: expected ‘pid_t’ but argument is of type ‘struct cred *’
static inline void audit_log_capset(pid_t pid, const struct cred *new,
^
kernel/capability.c:280:2: error: too few arguments to function ‘audit_log_capset’
audit_log_capset(new, current_cred());
^
In file included from kernel/capability.c:10:0:
include/linux/audit.h:400:20: note: declared here
static inline void audit_log_capset(pid_t pid, const struct cred *new,
^
make[1]: *** [kernel/capability.o] Error 1
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
---
include/linux/audit.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/audit.h b/include/linux/audit.h
index b4d5160..6976219 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -397,8 +397,8 @@ static inline int audit_log_bprm_fcaps(struct linux_binprm *bprm,
{
return 0;
}
-static inline void audit_log_capset(pid_t pid, const struct cred *new,
- const struct cred *old)
+static inline void audit_log_capset(const struct cred *new,
+ const struct cred *old)
{ }
static inline void audit_mmap_fd(int fd, int flags)
{ }
--
1.8.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] audit: fix build error when disable audit
2013-12-19 2:34 [PATCH] audit: fix build error when disable audit Gao feng
@ 2013-12-19 2:40 ` Gao feng
2013-12-20 1:19 ` Richard Guy Briggs
0 siblings, 1 reply; 6+ messages in thread
From: Gao feng @ 2013-12-19 2:40 UTC (permalink / raw)
To: Gao feng, linux-audit; +Cc: linux-kernel
On 12/19/2013 10:34 AM, Gao feng wrote:
> kernel/capability.c: In function ‘SYSC_capset’:
> kernel/capability.c:280:2: warning: passing argument 1 of ‘audit_log_capset’ makes integer from pointer without a cast [enabled by default]
> audit_log_capset(new, current_cred());
> ^
> In file included from kernel/capability.c:10:0:
> include/linux/audit.h:400:20: note: expected ‘pid_t’ but argument is of type ‘struct cred *’
> static inline void audit_log_capset(pid_t pid, const struct cred *new,
> ^
> kernel/capability.c:280:2: error: too few arguments to function ‘audit_log_capset’
> audit_log_capset(new, current_cred());
> ^
> In file included from kernel/capability.c:10:0:
> include/linux/audit.h:400:20: note: declared here
> static inline void audit_log_capset(pid_t pid, const struct cred *new,
> ^
> make[1]: *** [kernel/capability.o] Error 1
>
BTW, bug introduced by commmit 26b81eb408c411d86c7cc93278fb88fbcd785f65
audit: Simplify and correct audit_log_capset
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] audit: fix build error when disable audit
2013-12-19 2:40 ` Gao feng
@ 2013-12-20 1:19 ` Richard Guy Briggs
2013-12-20 1:39 ` Gao feng
0 siblings, 1 reply; 6+ messages in thread
From: Richard Guy Briggs @ 2013-12-20 1:19 UTC (permalink / raw)
To: Gao feng; +Cc: linux-audit, linux-kernel
On 13/12/19, Gao feng wrote:
> On 12/19/2013 10:34 AM, Gao feng wrote:
> > kernel/capability.c: In function ‘SYSC_capset’:
> > kernel/capability.c:280:2: warning: passing argument 1 of ‘audit_log_capset’ makes integer from pointer without a cast [enabled by default]
> > audit_log_capset(new, current_cred());
> > ^
> > In file included from kernel/capability.c:10:0:
> > include/linux/audit.h:400:20: note: expected ‘pid_t’ but argument is of type ‘struct cred *’
> > static inline void audit_log_capset(pid_t pid, const struct cred *new,
> > ^
> > kernel/capability.c:280:2: error: too few arguments to function ‘audit_log_capset’
> > audit_log_capset(new, current_cred());
> > ^
> > In file included from kernel/capability.c:10:0:
> > include/linux/audit.h:400:20: note: declared here
> > static inline void audit_log_capset(pid_t pid, const struct cred *new,
> > ^
> > make[1]: *** [kernel/capability.o] Error 1
>
> BTW, bug introduced by commmit 26b81eb408c411d86c7cc93278fb88fbcd785f65
> audit: Simplify and correct audit_log_capset
Yup, found it. Thanks for the patch. Since it isn't upstream yet, I
may merge it and rebase for linux-next.
> --
> Linux-audit mailing list
> Linux-audit@redhat.com
> https://www.redhat.com/mailman/listinfo/linux-audit
- RGB
--
Richard Guy Briggs <rbriggs@redhat.com>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] audit: fix build error when disable audit
2013-12-20 1:19 ` Richard Guy Briggs
@ 2013-12-20 1:39 ` Gao feng
2013-12-20 1:40 ` Richard Guy Briggs
0 siblings, 1 reply; 6+ messages in thread
From: Gao feng @ 2013-12-20 1:39 UTC (permalink / raw)
To: Richard Guy Briggs; +Cc: linux-audit, linux-kernel
On 12/20/2013 09:19 AM, Richard Guy Briggs wrote:
> On 13/12/19, Gao feng wrote:
>> On 12/19/2013 10:34 AM, Gao feng wrote:
>>> kernel/capability.c: In function ‘SYSC_capset’:
>>> kernel/capability.c:280:2: warning: passing argument 1 of ‘audit_log_capset’ makes integer from pointer without a cast [enabled by default]
>>> audit_log_capset(new, current_cred());
>>> ^
>>> In file included from kernel/capability.c:10:0:
>>> include/linux/audit.h:400:20: note: expected ‘pid_t’ but argument is of type ‘struct cred *’
>>> static inline void audit_log_capset(pid_t pid, const struct cred *new,
>>> ^
>>> kernel/capability.c:280:2: error: too few arguments to function ‘audit_log_capset’
>>> audit_log_capset(new, current_cred());
>>> ^
>>> In file included from kernel/capability.c:10:0:
>>> include/linux/audit.h:400:20: note: declared here
>>> static inline void audit_log_capset(pid_t pid, const struct cred *new,
>>> ^
>>> make[1]: *** [kernel/capability.o] Error 1
>>
>> BTW, bug introduced by commmit 26b81eb408c411d86c7cc93278fb88fbcd785f65
>> audit: Simplify and correct audit_log_capset
>
> Yup, found it. Thanks for the patch. Since it isn't upstream yet, I
> may merge it and rebase for linux-next.
>
thank you Richard, btw, do you have plan to push these changes to the linux-next?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] audit: fix build error when disable audit
2013-12-20 1:39 ` Gao feng
@ 2013-12-20 1:40 ` Richard Guy Briggs
2013-12-20 2:26 ` Gao feng
0 siblings, 1 reply; 6+ messages in thread
From: Richard Guy Briggs @ 2013-12-20 1:40 UTC (permalink / raw)
To: Gao feng; +Cc: linux-audit, linux-kernel
On 13/12/20, Gao feng wrote:
> On 12/20/2013 09:19 AM, Richard Guy Briggs wrote:
> > On 13/12/19, Gao feng wrote:
> >> On 12/19/2013 10:34 AM, Gao feng wrote:
> >>> kernel/capability.c: In function ‘SYSC_capset’:
> >>> kernel/capability.c:280:2: warning: passing argument 1 of ‘audit_log_capset’ makes integer from pointer without a cast [enabled by default]
> >>> audit_log_capset(new, current_cred());
> >>> ^
> >>> In file included from kernel/capability.c:10:0:
> >>> include/linux/audit.h:400:20: note: expected ‘pid_t’ but argument is of type ‘struct cred *’
> >>> static inline void audit_log_capset(pid_t pid, const struct cred *new,
> >>> ^
> >>> kernel/capability.c:280:2: error: too few arguments to function ‘audit_log_capset’
> >>> audit_log_capset(new, current_cred());
> >>> ^
> >>> In file included from kernel/capability.c:10:0:
> >>> include/linux/audit.h:400:20: note: declared here
> >>> static inline void audit_log_capset(pid_t pid, const struct cred *new,
> >>> ^
> >>> make[1]: *** [kernel/capability.o] Error 1
> >>
> >> BTW, bug introduced by commmit 26b81eb408c411d86c7cc93278fb88fbcd785f65
> >> audit: Simplify and correct audit_log_capset
> >
> > Yup, found it. Thanks for the patch. Since it isn't upstream yet, I
> > may merge it and rebase for linux-next.
>
> thank you Richard, btw, do you have plan to push these changes to the linux-next?
Yes, that's where I'm putting all these, via Eric.
- RGB
--
Richard Guy Briggs <rbriggs@redhat.com>
Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat
Remote, Ottawa, Canada
Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] audit: fix build error when disable audit
2013-12-20 1:40 ` Richard Guy Briggs
@ 2013-12-20 2:26 ` Gao feng
0 siblings, 0 replies; 6+ messages in thread
From: Gao feng @ 2013-12-20 2:26 UTC (permalink / raw)
To: Richard Guy Briggs; +Cc: linux-audit, linux-kernel
On 12/20/2013 09:40 AM, Richard Guy Briggs wrote:
> On 13/12/20, Gao feng wrote:
>> On 12/20/2013 09:19 AM, Richard Guy Briggs wrote:
>>> On 13/12/19, Gao feng wrote:
>>>> On 12/19/2013 10:34 AM, Gao feng wrote:
>>>>> kernel/capability.c: In function ‘SYSC_capset’:
>>>>> kernel/capability.c:280:2: warning: passing argument 1 of ‘audit_log_capset’ makes integer from pointer without a cast [enabled by default]
>>>>> audit_log_capset(new, current_cred());
>>>>> ^
>>>>> In file included from kernel/capability.c:10:0:
>>>>> include/linux/audit.h:400:20: note: expected ‘pid_t’ but argument is of type ‘struct cred *’
>>>>> static inline void audit_log_capset(pid_t pid, const struct cred *new,
>>>>> ^
>>>>> kernel/capability.c:280:2: error: too few arguments to function ‘audit_log_capset’
>>>>> audit_log_capset(new, current_cred());
>>>>> ^
>>>>> In file included from kernel/capability.c:10:0:
>>>>> include/linux/audit.h:400:20: note: declared here
>>>>> static inline void audit_log_capset(pid_t pid, const struct cred *new,
>>>>> ^
>>>>> make[1]: *** [kernel/capability.o] Error 1
>>>>
>>>> BTW, bug introduced by commmit 26b81eb408c411d86c7cc93278fb88fbcd785f65
>>>> audit: Simplify and correct audit_log_capset
>>>
>>> Yup, found it. Thanks for the patch. Since it isn't upstream yet, I
>>> may merge it and rebase for linux-next.
>>
>> thank you Richard, btw, do you have plan to push these changes to the linux-next?
>
> Yes, that's where I'm putting all these, via Eric.
>
get it, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-20 2:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-19 2:34 [PATCH] audit: fix build error when disable audit Gao feng
2013-12-19 2:40 ` Gao feng
2013-12-20 1:19 ` Richard Guy Briggs
2013-12-20 1:39 ` Gao feng
2013-12-20 1:40 ` Richard Guy Briggs
2013-12-20 2:26 ` Gao feng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox