[PATCH] audit: use ktime_get_coarse_ts64() for time access

[PATCH] audit: use ktime_get_coarse_ts64() for time access

[Arnd Bergmann]

The API got renamed for consistency with the other time accessors,
this changes the audit caller as well.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 kernel/audit.c   | 2 +-
 kernel/auditsc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index e7478cb58079..3e34b9f03cfe 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1724,7 +1724,7 @@ static inline void audit_get_stamp(struct audit_context *ctx,
 				   struct timespec64 *t, unsigned int *serial)
 {
 	if (!ctx || !auditsc_get_stamp(ctx, t, serial)) {
-		*t = current_kernel_time64();
+		ktime_get_coarse_ts64(t);
 		*serial = audit_serial();
 	}
 }
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index ceb1c4596c51..dbbf02f513a8 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -1540,10 +1540,10 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
 	context->argv[2]    = a3;
 	context->argv[3]    = a4;
 	context->serial     = 0;
-	context->ctime = current_kernel_time64();
 	context->in_syscall = 1;
 	context->current_state  = state;
 	context->ppid       = 0;
+	ktime_get_coarse_ts64(&context->ctime);
 }
 
 /**
-- 
2.9.0

Re: [PATCH] audit: use ktime_get_coarse_ts64() for time access

[Richard Guy Briggs]

On 2018-06-18 16:58, Arnd Bergmann wrote:
> The API got renamed for consistency with the other time accessors,
> this changes the audit caller as well.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

This looks reasonable to me.
Not that I think it matters, but any reason it was swapped in a
different code location other than aesthetics?  Time and serial are
usually used together in our code.

Reviewed-by: Richard Guy Briggs <rgb@redhat.com>

> ---
>  kernel/audit.c   | 2 +-
>  kernel/auditsc.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/audit.c b/kernel/audit.c
> index e7478cb58079..3e34b9f03cfe 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -1724,7 +1724,7 @@ static inline void audit_get_stamp(struct audit_context *ctx,
>  				   struct timespec64 *t, unsigned int *serial)
>  {
>  	if (!ctx || !auditsc_get_stamp(ctx, t, serial)) {
> -		*t = current_kernel_time64();
> +		ktime_get_coarse_ts64(t);
>  		*serial = audit_serial();
>  	}
>  }
> diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> index ceb1c4596c51..dbbf02f513a8 100644
> --- a/kernel/auditsc.c
> +++ b/kernel/auditsc.c
> @@ -1540,10 +1540,10 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
>  	context->argv[2]    = a3;
>  	context->argv[3]    = a4;
>  	context->serial     = 0;
> -	context->ctime = current_kernel_time64();
>  	context->in_syscall = 1;
>  	context->current_state  = state;
>  	context->ppid       = 0;
> +	ktime_get_coarse_ts64(&context->ctime);
>  }
>  
>  /**
> -- 
> 2.9.0
> 

- RGB

--
Richard Guy Briggs <rgb@redhat.com>
Sr. S/W Engineer, Kernel Security, Base Operating Systems
Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635

Re: [PATCH] audit: use ktime_get_coarse_ts64() for time access

[Paul Moore]

On Fri, Jun 22, 2018 at 4:26 PM Richard Guy Briggs <rgb@redhat.com> wrote:
> On 2018-06-18 16:58, Arnd Bergmann wrote:
> > The API got renamed for consistency with the other time accessors,
> > this changes the audit caller as well.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> This looks reasonable to me.
> Not that I think it matters, but any reason it was swapped in a
> different code location other than aesthetics?  Time and serial are
> usually used together in our code.
>
> Reviewed-by: Richard Guy Briggs <rgb@redhat.com>

Looks fine to me too.  Merged, thanks.

> > ---
> >  kernel/audit.c   | 2 +-
> >  kernel/auditsc.c | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/kernel/audit.c b/kernel/audit.c
> > index e7478cb58079..3e34b9f03cfe 100644
> > --- a/kernel/audit.c
> > +++ b/kernel/audit.c
> > @@ -1724,7 +1724,7 @@ static inline void audit_get_stamp(struct audit_context *ctx,
> >                                  struct timespec64 *t, unsigned int *serial)
> >  {
> >       if (!ctx || !auditsc_get_stamp(ctx, t, serial)) {
> > -             *t = current_kernel_time64();
> > +             ktime_get_coarse_ts64(t);
> >               *serial = audit_serial();
> >       }
> >  }
> > diff --git a/kernel/auditsc.c b/kernel/auditsc.c
> > index ceb1c4596c51..dbbf02f513a8 100644
> > --- a/kernel/auditsc.c
> > +++ b/kernel/auditsc.c
> > @@ -1540,10 +1540,10 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2,
> >       context->argv[2]    = a3;
> >       context->argv[3]    = a4;
> >       context->serial     = 0;
> > -     context->ctime = current_kernel_time64();
> >       context->in_syscall = 1;
> >       context->current_state  = state;
> >       context->ppid       = 0;
> > +     ktime_get_coarse_ts64(&context->ctime);
> >  }
> >
> >  /**
> > --
> > 2.9.0
> >
>
> - RGB
>
> --
> Richard Guy Briggs <rgb@redhat.com>
> Sr. S/W Engineer, Kernel Security, Base Operating Systems
> Remote, Ottawa, Red Hat Canada
> IRC: rgb, SunRaycer
> Voice: +1.647.777.2635, Internal: (81) 32635



-- 
paul moore
www.paul-moore.com