* linux-next: build failure after merge of the audit tree
@ 2013-11-06 6:27 Stephen Rothwell
2013-11-06 16:54 ` Eric Paris
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2013-11-06 6:27 UTC (permalink / raw)
To: Eric Paris; +Cc: linux-next, linux-kernel, Richard Guy Briggs
[-- Attachment #1: Type: text/plain, Size: 917 bytes --]
Hi Eric,
After merging the audit tree, today's linux-next build (x86_64
allmodconfig) failed like this:
kernel/auditsc.c: In function 'audit_set_loginuid':
kernel/auditsc.c:2003:15: error: incompatible types when assigning to type 'kuid_t' from type 'int'
oldsessionid = audit_get_sessionid(current);
^
kernel/auditsc.c:2016:2: error: incompatible type for argument 3 of 'audit_log_set_loginuid'
audit_log_set_loginuid(oldloginuid, loginuid, oldsessionid, sessionid, rc);
^
kernel/auditsc.c:1967:13: note: expected 'unsigned int' but argument is of type 'kuid_t'
static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid,
^
Caused by commit da0a610497ce ("audit: loginuid functions coding style").
I have used the version of the audit tree from next-20131105 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the audit tree
2013-11-06 6:27 linux-next: build failure after merge of the audit tree Stephen Rothwell
@ 2013-11-06 16:54 ` Eric Paris
0 siblings, 0 replies; 6+ messages in thread
From: Eric Paris @ 2013-11-06 16:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Richard Guy Briggs
On Wed, 2013-11-06 at 17:27 +1100, Stephen Rothwell wrote:
> Hi Eric,
>
> After merging the audit tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> kernel/auditsc.c: In function 'audit_set_loginuid':
> kernel/auditsc.c:2003:15: error: incompatible types when assigning to type 'kuid_t' from type 'int'
> oldsessionid = audit_get_sessionid(current);
> ^
> kernel/auditsc.c:2016:2: error: incompatible type for argument 3 of 'audit_log_set_loginuid'
> audit_log_set_loginuid(oldloginuid, loginuid, oldsessionid, sessionid, rc);
> ^
> kernel/auditsc.c:1967:13: note: expected 'unsigned int' but argument is of type 'kuid_t'
> static void audit_log_set_loginuid(kuid_t koldloginuid, kuid_t kloginuid,
> ^
>
> Caused by commit da0a610497ce ("audit: loginuid functions coding style").
>
> I have used the version of the audit tree from next-20131105 for today.
>
Should be fixed for tomorrow. Thank you.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the audit tree
2014-04-22 16:32 ` Eric Paris
@ 2014-04-22 21:27 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2014-04-22 21:27 UTC (permalink / raw)
To: Eric Paris; +Cc: linux-next, linux-kernel, Richard Briggs, sparclinux
[-- Attachment #1: Type: text/plain, Size: 1708 bytes --]
Hi Eric,
On Tue, 22 Apr 2014 12:32:40 -0400 Eric Paris <eparis@redhat.com> wrote:
>
> I swear I saw this and I fixed it. Drat. Do we want to do it this way?
> Above in syscall_get_arguments() they use
>
> #ifdef CONFIG_SPARC64
> if (test_tsk_thread_flag(task, TIF_32BIT))
> zero_extend = 1;
> #endif
>
> Is CONFIG_SPARC64 a better choice than:
> defined(__sparc__) && defined(__arch64__)
I have no idea, I just copied the test from thread_info.h.
> Maybe even better would be to copy what you suggested in powerpc:
That would be better, except ...
> diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h
> index fed3d51..49f71fd 100644
> --- a/arch/sparc/include/asm/syscall.h
> +++ b/arch/sparc/include/asm/syscall.h
> @@ -128,8 +128,7 @@ static inline void syscall_set_arguments(struct task_struct *task,
>
> static inline int syscall_get_arch(void)
> {
> - return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC
> - : AUDIT_ARCH_SPARC64;
> + return is_32bit_task() ? AUDIT_ARCH_SPARC : AUDIT_ARCH_SPARC64;
> }
>
> #endif /* __ASM_SPARC_SYSCALL_H */
> diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
> index 96efa7a..acd2be0 100644
> --- a/arch/sparc/include/asm/thread_info_32.h
> +++ b/arch/sparc/include/asm/thread_info_32.h
> @@ -130,6 +130,8 @@ register struct thread_info *current_thread_info_reg asm("g6");
> #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | \
> _TIF_SIGPENDING)
>
> +#define is_32bit_task() (0)
Shouldn't that be (1) ?
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the audit tree
2014-04-22 6:22 Stephen Rothwell
2014-04-22 15:56 ` Richard Guy Briggs
@ 2014-04-22 16:32 ` Eric Paris
2014-04-22 21:27 ` Stephen Rothwell
1 sibling, 1 reply; 6+ messages in thread
From: Eric Paris @ 2014-04-22 16:32 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Richard Briggs, sparclinux
On Tue, 2014-04-22 at 16:22 +1000, Stephen Rothwell wrote:
> Hi Eric,
>
> After merging the audit tree, today's linux-next build (sparc defconfig)
> failed like this:
>
> In file included from include/linux/audit.h:29:0,
> from mm/mmap.c:33:
> arch/sparc/include/asm/syscall.h: In function 'syscall_get_arch':
> arch/sparc/include/asm/syscall.h:131:9: error: 'TIF_32BIT' undeclared (first use in this function)
> arch/sparc/include/asm/syscall.h:131:9: note: each undeclared identifier is reported only once for each function it appears in
>
> And many more ...
>
> Caused by commit 374c0c054122 ("ARCH: AUDIT: implement syscall_get_arch
> for all arches").
>
> I applied this patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 22 Apr 2014 16:18:53 +1000
> Subject: [PATCH] fix ARCH: AUDIT: implement syscall_get_arch for all arches
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/sparc/include/asm/syscall.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h
> index fed3d511b108..a5a8153766b3 100644
> --- a/arch/sparc/include/asm/syscall.h
> +++ b/arch/sparc/include/asm/syscall.h
> @@ -128,8 +128,12 @@ static inline void syscall_set_arguments(struct task_struct *task,
>
> static inline int syscall_get_arch(void)
> {
> +#if defined(__sparc__) && defined(__arch64__)
> return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC
> : AUDIT_ARCH_SPARC64;
> +#else
> + return AUDIT_ARCH_SPARC;
> +#endif
> }
>
> #endif /* __ASM_SPARC_SYSCALL_H */
> --
I swear I saw this and I fixed it. Drat. Do we want to do it this way?
Above in syscall_get_arguments() they use
#ifdef CONFIG_SPARC64
if (test_tsk_thread_flag(task, TIF_32BIT))
zero_extend = 1;
#endif
Is CONFIG_SPARC64 a better choice than:
defined(__sparc__) && defined(__arch64__)
Maybe even better would be to copy what you suggested in powerpc:
---
diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h
index fed3d51..49f71fd 100644
--- a/arch/sparc/include/asm/syscall.h
+++ b/arch/sparc/include/asm/syscall.h
@@ -128,8 +128,7 @@ static inline void syscall_set_arguments(struct task_struct *task,
static inline int syscall_get_arch(void)
{
- return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC
- : AUDIT_ARCH_SPARC64;
+ return is_32bit_task() ? AUDIT_ARCH_SPARC : AUDIT_ARCH_SPARC64;
}
#endif /* __ASM_SPARC_SYSCALL_H */
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index 96efa7a..acd2be0 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -130,6 +130,8 @@ register struct thread_info *current_thread_info_reg asm("g6");
#define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | \
_TIF_SIGPENDING)
+#define is_32bit_task() (0)
+
#endif /* __KERNEL__ */
#endif /* _ASM_THREAD_INFO_H */
diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
index a5f01ac..5a4f660 100644
--- a/arch/sparc/include/asm/thread_info_64.h
+++ b/arch/sparc/include/asm/thread_info_64.h
@@ -219,6 +219,8 @@ register struct thread_info *current_thread_info_reg asm("g6");
_TIF_NEED_RESCHED)
#define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
+#define is_32bit_task() (test_thread_flag(TIF_32BIT))
+
/*
* Thread-synchronous status.
*
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the audit tree
2014-04-22 6:22 Stephen Rothwell
@ 2014-04-22 15:56 ` Richard Guy Briggs
2014-04-22 16:32 ` Eric Paris
1 sibling, 0 replies; 6+ messages in thread
From: Richard Guy Briggs @ 2014-04-22 15:56 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Eric Paris, linux-next, linux-kernel, sparclinux
On 14/04/22, Stephen Rothwell wrote:
> Hi Eric,
>
> After merging the audit tree, today's linux-next build (sparc defconfig)
> failed like this:
>
> In file included from include/linux/audit.h:29:0,
> from mm/mmap.c:33:
> arch/sparc/include/asm/syscall.h: In function 'syscall_get_arch':
> arch/sparc/include/asm/syscall.h:131:9: error: 'TIF_32BIT' undeclared (first use in this function)
> arch/sparc/include/asm/syscall.h:131:9: note: each undeclared identifier is reported only once for each function it appears in
>
> And many more ...
>
> Caused by commit 374c0c054122 ("ARCH: AUDIT: implement syscall_get_arch
> for all arches").
>
> I applied this patch for today:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 22 Apr 2014 16:18:53 +1000
> Subject: [PATCH] fix ARCH: AUDIT: implement syscall_get_arch for all arches
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Looks good to me. Thanks.
Acked-by: Richard Guy Briggs <rgb@redhat.com>
> ---
> arch/sparc/include/asm/syscall.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h
> index fed3d511b108..a5a8153766b3 100644
> --- a/arch/sparc/include/asm/syscall.h
> +++ b/arch/sparc/include/asm/syscall.h
> @@ -128,8 +128,12 @@ static inline void syscall_set_arguments(struct task_struct *task,
>
> static inline int syscall_get_arch(void)
> {
> +#if defined(__sparc__) && defined(__arch64__)
> return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC
> : AUDIT_ARCH_SPARC64;
> +#else
> + return AUDIT_ARCH_SPARC;
> +#endif
> }
>
> #endif /* __ASM_SPARC_SYSCALL_H */
> --
> 1.9.2
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
- 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
* linux-next: build failure after merge of the audit tree
@ 2014-04-22 6:22 Stephen Rothwell
2014-04-22 15:56 ` Richard Guy Briggs
2014-04-22 16:32 ` Eric Paris
0 siblings, 2 replies; 6+ messages in thread
From: Stephen Rothwell @ 2014-04-22 6:22 UTC (permalink / raw)
To: Eric Paris; +Cc: linux-next, linux-kernel, Richard Briggs, sparclinux
[-- Attachment #1: Type: text/plain, Size: 1602 bytes --]
Hi Eric,
After merging the audit tree, today's linux-next build (sparc defconfig)
failed like this:
In file included from include/linux/audit.h:29:0,
from mm/mmap.c:33:
arch/sparc/include/asm/syscall.h: In function 'syscall_get_arch':
arch/sparc/include/asm/syscall.h:131:9: error: 'TIF_32BIT' undeclared (first use in this function)
arch/sparc/include/asm/syscall.h:131:9: note: each undeclared identifier is reported only once for each function it appears in
And many more ...
Caused by commit 374c0c054122 ("ARCH: AUDIT: implement syscall_get_arch
for all arches").
I applied this patch for today:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 22 Apr 2014 16:18:53 +1000
Subject: [PATCH] fix ARCH: AUDIT: implement syscall_get_arch for all arches
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/sparc/include/asm/syscall.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/sparc/include/asm/syscall.h b/arch/sparc/include/asm/syscall.h
index fed3d511b108..a5a8153766b3 100644
--- a/arch/sparc/include/asm/syscall.h
+++ b/arch/sparc/include/asm/syscall.h
@@ -128,8 +128,12 @@ static inline void syscall_set_arguments(struct task_struct *task,
static inline int syscall_get_arch(void)
{
+#if defined(__sparc__) && defined(__arch64__)
return test_thread_flag(TIF_32BIT) ? AUDIT_ARCH_SPARC
: AUDIT_ARCH_SPARC64;
+#else
+ return AUDIT_ARCH_SPARC;
+#endif
}
#endif /* __ASM_SPARC_SYSCALL_H */
--
1.9.2
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-04-22 21:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-06 6:27 linux-next: build failure after merge of the audit tree Stephen Rothwell
2013-11-06 16:54 ` Eric Paris
2014-04-22 6:22 Stephen Rothwell
2014-04-22 15:56 ` Richard Guy Briggs
2014-04-22 16:32 ` Eric Paris
2014-04-22 21:27 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).