public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] include/linux/audit.h: Move dummy audit_file() from !AUDIT area to !AUDITSYSCALL area
@ 2014-11-04 15:09 Chen Gang
  2014-11-05 20:43 ` Paul Moore
  0 siblings, 1 reply; 6+ messages in thread
From: Chen Gang @ 2014-11-04 15:09 UTC (permalink / raw)
  To: Al Viro, paul, eparis; +Cc: linux-audit, linux-kernel@vger.kernel.org

audit_file() is related with AUDITSYSCALL, not related with AUDIT, so
need move dummy one from !AUDIT area to !AUDITSYSCALL area. Or it will
cause issue if CONFIG_AUDIT with !CONFIG_AUDITSYSCALL.

The related error (with allmodconfig under tile):

    CC      fs/open.o
  fs/open.c: In function 'SYSC_fchmod':
  fs/open.c:530:3: error: implicit declaration of function 'audit_file' [-Werror=implicit-function-declaration]
     audit_file(f.file);
     ^

Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
---
 include/linux/audit.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 295ae1c..7b1d0d1 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -363,6 +363,8 @@ static inline void audit_inode(struct filename *name,
 				const struct dentry *dentry,
 				unsigned int parent)
 { }
+static inline void audit_file(struct file *file)
+{ }
 static inline void audit_inode_parent_hidden(struct filename *name,
 				const struct dentry *dentry)
 { }
@@ -538,9 +540,6 @@ static inline void audit_log_task_info(struct audit_buffer *ab,
 				       struct task_struct *tsk)
 { }
 #define audit_enabled 0
-static inline void audit_file(struct file *file)
-{
-}
 #endif /* CONFIG_AUDIT */
 static inline void audit_log_string(struct audit_buffer *ab, const char *buf)
 {
-- 
1.9.3

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH] include/linux/audit.h: Move dummy audit_file() from !AUDIT area to !AUDITSYSCALL area
@ 2014-11-06 23:39 Chen Gang
  0 siblings, 0 replies; 6+ messages in thread
From: Chen Gang @ 2014-11-06 23:39 UTC (permalink / raw)
  To: Paul Moore; +Cc: Al Viro, eparis, linux-kernel

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=utf-8, Size: 2996 bytes --]

I intended to put it here for topology symmetric position with the
real world declaration.  Please check.

Thanks.

Send from Lenovo A788t.

Paul Moore <paul@paul-moore.com> wrote:

>On Thursday, November 06, 2014 11:19:06 AM Chen Gang wrote:
>> On 11/6/14 4:43, Paul Moore wrote:
>> > On Tuesday, November 04, 2014 11:09:52 PM Chen Gang wrote:
>> >> audit_file() is related with AUDITSYSCALL, not related with AUDIT, so
>> >> need move dummy one from !AUDIT area to !AUDITSYSCALL area. Or it will
>> >> cause issue if CONFIG_AUDIT with !CONFIG_AUDITSYSCALL.
>> >> 
>> >> The related error (with allmodconfig under tile):
>> >>     CC      fs/open.o
>> >>   
>> >>   fs/open.c: In function 'SYSC_fchmod':
>> >>   fs/open.c:530:3: error: implicit declaration of function 'audit_file'
>> >> 
>> >> [-Werror=implicit-function-declaration] audit_file(f.file);
>> >> 
>> >>      ^
>> >> 
>> >> Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
>> >> ---
>> >> 
>> >>  include/linux/audit.h | 5 ++---
>> >>  1 file changed, 2 insertions(+), 3 deletions(-)
>> > 
>> > What version of the kernel source are you looking at?  I don't see the
>> > audit_file() function anywhere ...
>> 
>> It is for next tree. Sorry for not marking it in subject, originally.
>
>Sorry, I didn't see Al's patch posted to the audit list and it wasn't in the 
>audit next branch so I was a bit confused.
>
>Regardless, it looks fine to me.  While normally I'd pull this into the audit 
>next branch, in this case it is best if Al pulls this into his tree so it goes 
>in with the original audit_file() patch.
>
>If you have to respin this patch I might suggest moving the prototype to after 
>the other audit_inode*() prototypes, e.g. just before audit_core_dumps(), but 
>that is a pretty nit-picky thing.
>
>Acked-by: Paul Moore <paul@paul-moore.com>
>
>> >> diff --git a/include/linux/audit.h b/include/linux/audit.h
>> >> index 295ae1c..7b1d0d1 100644
>> >> --- a/include/linux/audit.h
>> >> +++ b/include/linux/audit.h
>> >> @@ -363,6 +363,8 @@ static inline void audit_inode(struct filename *name,
>> >> 
>> >>  				const struct dentry *dentry,
>> >>  				unsigned int parent)
>> >>  
>> >>  { }
>> >> 
>> >> +static inline void audit_file(struct file *file)
>> >> +{ }
>> >> 
>> >>  static inline void audit_inode_parent_hidden(struct filename *name,
>> >>  
>> >>  				const struct dentry *dentry)
>> >>  
>> >>  { }
>> >> 
>> >> @@ -538,9 +540,6 @@ static inline void audit_log_task_info(struct
>> >> audit_buffer *ab, struct task_struct *tsk)
>> >> 
>> >>  { }
>> >>  #define audit_enabled 0
>> >> 
>> >> -static inline void audit_file(struct file *file)
>> >> -{
>> >> -}
>> >> 
>> >>  #endif /* CONFIG_AUDIT */
>> >>  static inline void audit_log_string(struct audit_buffer *ab, const char
>> >> 
>> >> *buf) {
>
>-- 
>paul moore
>www.paul-moore.com
>
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-06 23:40 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-04 15:09 [PATCH] include/linux/audit.h: Move dummy audit_file() from !AUDIT area to !AUDITSYSCALL area Chen Gang
2014-11-05 20:43 ` Paul Moore
2014-11-06  3:19   ` Chen Gang
2014-11-06 16:50     ` Paul Moore
2014-11-06 12:11   ` Mark Brown
  -- strict thread matches above, loose matches on Subject: below --
2014-11-06 23:39 Chen Gang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox