[PATCH] bsdacct: fix uid/gid misreporting (#14676)

[PATCH] bsdacct: fix uid/gid misreporting (#14676)

[Alexey Dobriyan]

commit d8e180dcd5bbbab9cd3ff2e779efcf70692ef541
"bsdacct: switch credentials for writing to the accounting file"
introduced credential switching during final acct data collecting.
However, uid/gid pair continued to be collected from current which
became credentials of who created acct file, not who exits.

Fix http://bugzilla.kernel.org/show_bug.cgi?id=14676

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---

 Juho, please, confirm.

 kernel/acct.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -536,7 +536,8 @@ static void do_acct_process(struct bsd_acct_struct *acct,
 	do_div(elapsed, AHZ);
 	ac.ac_btime = get_seconds() - elapsed;
 	/* we really need to bite the bullet and change layout */
-	current_uid_gid(&ac.ac_uid, &ac.ac_gid);
+	ac.ac_uid = orig_cred->uid;
+	ac.ac_gid = orig_cred->gid;
 #if ACCT_VERSION==2
 	ac.ac_ahz = AHZ;
 #endif

Re: [PATCH] bsdacct: fix uid/gid misreporting (#14676)

[Serge E. Hallyn]

Quoting Alexey Dobriyan (adobriyan@gmail.com):
> commit d8e180dcd5bbbab9cd3ff2e779efcf70692ef541
> "bsdacct: switch credentials for writing to the accounting file"
> introduced credential switching during final acct data collecting.
> However, uid/gid pair continued to be collected from current which
> became credentials of who created acct file, not who exits.
> 
> Fix http://bugzilla.kernel.org/show_bug.cgi?id=14676
> 
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Yeah seems like it wouuld be needed, thanks.

Acked-by: Serge Hallyn <serue@us.ibm.com>

> ---
> 
>  Juho, please, confirm.
> 
>  kernel/acct.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> --- a/kernel/acct.c
> +++ b/kernel/acct.c
> @@ -536,7 +536,8 @@ static void do_acct_process(struct bsd_acct_struct *acct,
>  	do_div(elapsed, AHZ);
>  	ac.ac_btime = get_seconds() - elapsed;
>  	/* we really need to bite the bullet and change layout */
> -	current_uid_gid(&ac.ac_uid, &ac.ac_gid);
> +	ac.ac_uid = orig_cred->uid;
> +	ac.ac_gid = orig_cred->gid;
>  #if ACCT_VERSION==2
>  	ac.ac_ahz = AHZ;
>  #endif

Re: [PATCH] bsdacct: fix uid/gid misreporting (#14676)

[David Howells]

Alexey Dobriyan <adobriyan@gmail.com> wrote:

> commit d8e180dcd5bbbab9cd3ff2e779efcf70692ef541
> "bsdacct: switch credentials for writing to the accounting file"
> introduced credential switching during final acct data collecting.
> However, uid/gid pair continued to be collected from current which
> became credentials of who created acct file, not who exits.
> 
> Fix http://bugzilla.kernel.org/show_bug.cgi?id=14676
> 
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Acked-by: David Howells <dhowells@redhat.com>

Re: [PATCH] bsdacct: fix uid/gid misreporting (#14676)

[Michal Schmidt]

On Tue, 1 Dec 2009 01:40:32 +0300 Alexey Dobriyan wrote:
> commit d8e180dcd5bbbab9cd3ff2e779efcf70692ef541
> "bsdacct: switch credentials for writing to the accounting file"
> introduced credential switching during final acct data collecting.
> However, uid/gid pair continued to be collected from current which
> became credentials of who created acct file, not who exits.
> 
> Fix http://bugzilla.kernel.org/show_bug.cgi?id=14676
> 
> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Ah, indeed. The original commit went into 2.6.31-stable so this one
should too.

Reviewed-by: Michal Schmidt <mschmidt@redhat.com>

> 
>  Juho, please, confirm.
> 
>  kernel/acct.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> --- a/kernel/acct.c
> +++ b/kernel/acct.c
> @@ -536,7 +536,8 @@ static void do_acct_process(struct
> bsd_acct_struct *acct, do_div(elapsed, AHZ);
>  	ac.ac_btime = get_seconds() - elapsed;
>  	/* we really need to bite the bullet and change layout */
> -	current_uid_gid(&ac.ac_uid, &ac.ac_gid);
> +	ac.ac_uid = orig_cred->uid;
> +	ac.ac_gid = orig_cred->gid;
>  #if ACCT_VERSION==2
>  	ac.ac_ahz = AHZ;
>  #endif

Re: [PATCH] bsdacct: fix uid/gid misreporting (#14676)

[James Morris]

On Tue, 1 Dec 2009, Michal Schmidt wrote:

> Ah, indeed. The original commit went into 2.6.31-stable so this one
> should too.
> 
> Reviewed-by: Michal Schmidt <mschmidt@redhat.com>
> 

This should probably go to Linus' tree in akpm's next batch.


-- 
James Morris
<jmorris@namei.org>