| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <ba484232-7b59-05b2-34a9-2d66d43ff382@c-s.fr>
Date: Wed, 20 Jun 2018 15:40:37 +0200
From: Christophe LEROY <christophe.leroy@....fr>
To: Paul Burton <paul.burton@...s.com>, linux-kbuild@...r.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@...nel.org>,
linux-mips@...ux-mips.org, Arnd Bergmann <arnd@...db.de>,
Ingo Molnar <mingo@...nel.org>,
Matthew Wilcox <matthew@....cx>,
Thomas Gleixner <tglx@...utronix.de>,
Douglas Anderson <dianders@...omium.org>,
Josh Poimboeuf <jpoimboe@...hat.com>,
Andrew Morton <akpm@...ux-foundation.org>,
Matthias Kaehlcke <mka@...omium.org>,
He Zhe <zhe.he@...driver.com>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Michal Marek <michal.lkml@...kovi.net>,
Khem Raj <raj.khem@...il.com>,
Al Viro <viro@...iv.linux.org.uk>,
Stafford Horne <shorne@...il.com>,
Gideon Israel Dsouza <gidisrael@...il.com>,
Masahiro Yamada <yamada.masahiro@...ionext.com>,
Kees Cook <keescook@...omium.org>,
Michael Ellerman <mpe@...erman.id.au>,
Heiko Carstens <heiko.carstens@...ibm.com>,
linux-kernel@...r.kernel.org, Paul Mackerras <paulus@...ba.org>,
linuxppc-dev@...ts.ozlabs.org
Subject: Re: [PATCH v2 3/3] powerpc: Remove -Wattribute-alias pragmas
Le 19/06/2018 à 22:14, Paul Burton a écrit :
> With SYSCALL_DEFINEx() disabling -Wattribute-alias generically, there's
> no need to duplicate that for PowerPC syscalls.
>
> This reverts commit 415520373975 ("powerpc: fix build failure by
> disabling attribute-alias warning in pci_32") and commit 2479bfc9bc60
> ("powerpc: Fix build by disabling attribute-alias warning for
> SYSCALL_DEFINEx").
>
> Signed-off-by: Paul Burton <paul.burton@...s.com>
> Cc: Michal Marek <michal.lkml@...kovi.net>
> Cc: Masahiro Yamada <yamada.masahiro@...ionext.com>
> Cc: Douglas Anderson <dianders@...omium.org>
> Cc: Al Viro <viro@...iv.linux.org.uk>
> Cc: Heiko Carstens <heiko.carstens@...ibm.com>
> Cc: Mauro Carvalho Chehab <mchehab@...nel.org>
> Cc: Matthew Wilcox <matthew@....cx>
> Cc: Matthias Kaehlcke <mka@...omium.org>
> Cc: Arnd Bergmann <arnd@...db.de>
> Cc: Ingo Molnar <mingo@...nel.org>
> Cc: Josh Poimboeuf <jpoimboe@...hat.com>
> Cc: Kees Cook <keescook@...omium.org>
> Cc: Andrew Morton <akpm@...ux-foundation.org>
> Cc: Thomas Gleixner <tglx@...utronix.de>
> Cc: Gideon Israel Dsouza <gidisrael@...il.com>
> Cc: Christophe Leroy <christophe.leroy@....fr>
> Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>
> Cc: Paul Mackerras <paulus@...ba.org>
> Cc: Michael Ellerman <mpe@...erman.id.au>
> Cc: Stafford Horne <shorne@...il.com>
> Cc: Khem Raj <raj.khem@...il.com>
> Cc: He Zhe <zhe.he@...driver.com>
> Cc: linux-kbuild@...r.kernel.org
> Cc: linux-kernel@...r.kernel.org
> Cc: linux-mips@...ux-mips.org
> Cc: linuxppc-dev@...ts.ozlabs.org
>
> ---
> Michael & Christophe, I didn't add your acks here yet since it changed
> to include the second revert that Christophe pointed out I'd missed & I
> didn't want to presume your acks extended to that.
Looks ok to me
Acked-by: Christophe Leroy <christophe.leroy@....fr>
>
> Changes in v2:
> - Also revert 2479bfc9bc60 ("powerpc: Fix build by disabling
> attribute-alias warning for SYSCALL_DEFINEx").
> - Change subject now that it's not just a simple one-commit revert.
>
> arch/powerpc/kernel/pci_32.c | 4 ----
> arch/powerpc/kernel/pci_64.c | 4 ----
> arch/powerpc/kernel/rtas.c | 4 ----
> arch/powerpc/kernel/signal_32.c | 8 --------
> arch/powerpc/kernel/signal_64.c | 4 ----
> arch/powerpc/kernel/syscalls.c | 4 ----
> arch/powerpc/mm/subpage-prot.c | 4 ----
> 7 files changed, 32 deletions(-)
>
> diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
> index 4f861055a852..d63b488d34d7 100644
> --- a/arch/powerpc/kernel/pci_32.c
> +++ b/arch/powerpc/kernel/pci_32.c
> @@ -285,9 +285,6 @@ pci_bus_to_hose(int bus)
> * Note that the returned IO or memory base is a physical address
> */
>
> -#pragma GCC diagnostic push
> -#pragma GCC diagnostic ignored "-Wpragmas"
> -#pragma GCC diagnostic ignored "-Wattribute-alias"
> SYSCALL_DEFINE3(pciconfig_iobase, long, which,
> unsigned long, bus, unsigned long, devfn)
> {
> @@ -313,4 +310,3 @@ SYSCALL_DEFINE3(pciconfig_iobase, long, which,
>
> return result;
> }
> -#pragma GCC diagnostic pop
> diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
> index 812171c09f42..dff28f903512 100644
> --- a/arch/powerpc/kernel/pci_64.c
> +++ b/arch/powerpc/kernel/pci_64.c
> @@ -203,9 +203,6 @@ void pcibios_setup_phb_io_space(struct pci_controller *hose)
> #define IOBASE_ISA_IO 3
> #define IOBASE_ISA_MEM 4
>
> -#pragma GCC diagnostic push
> -#pragma GCC diagnostic ignored "-Wpragmas"
> -#pragma GCC diagnostic ignored "-Wattribute-alias"
> SYSCALL_DEFINE3(pciconfig_iobase, long, which, unsigned long, in_bus,
> unsigned long, in_devfn)
> {
> @@ -259,7 +256,6 @@ SYSCALL_DEFINE3(pciconfig_iobase, long, which, unsigned long, in_bus,
>
> return -EOPNOTSUPP;
> }
> -#pragma GCC diagnostic pop
>
> #ifdef CONFIG_NUMA
> int pcibus_to_node(struct pci_bus *bus)
> diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
> index 7fb9f83dcde8..8afd146bc9c7 100644
> --- a/arch/powerpc/kernel/rtas.c
> +++ b/arch/powerpc/kernel/rtas.c
> @@ -1051,9 +1051,6 @@ struct pseries_errorlog *get_pseries_errorlog(struct rtas_error_log *log,
> }
>
> /* We assume to be passed big endian arguments */
> -#pragma GCC diagnostic push
> -#pragma GCC diagnostic ignored "-Wpragmas"
> -#pragma GCC diagnostic ignored "-Wattribute-alias"
> SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs)
> {
> struct rtas_args args;
> @@ -1140,7 +1137,6 @@ SYSCALL_DEFINE1(rtas, struct rtas_args __user *, uargs)
>
> return 0;
> }
> -#pragma GCC diagnostic pop
>
> /*
> * Call early during boot, before mem init, to retrieve the RTAS
> diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
> index 5eedbb282d42..e6474a45cef5 100644
> --- a/arch/powerpc/kernel/signal_32.c
> +++ b/arch/powerpc/kernel/signal_32.c
> @@ -1038,9 +1038,6 @@ static int do_setcontext_tm(struct ucontext __user *ucp,
> }
> #endif
>
> -#pragma GCC diagnostic push
> -#pragma GCC diagnostic ignored "-Wpragmas"
> -#pragma GCC diagnostic ignored "-Wattribute-alias"
> #ifdef CONFIG_PPC64
> COMPAT_SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx,
> struct ucontext __user *, new_ctx, int, ctx_size)
> @@ -1134,7 +1131,6 @@ SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx,
> set_thread_flag(TIF_RESTOREALL);
> return 0;
> }
> -#pragma GCC diagnostic pop
>
> #ifdef CONFIG_PPC64
> COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
> @@ -1231,9 +1227,6 @@ SYSCALL_DEFINE0(rt_sigreturn)
> return 0;
> }
>
> -#pragma GCC diagnostic push
> -#pragma GCC diagnostic ignored "-Wpragmas"
> -#pragma GCC diagnostic ignored "-Wattribute-alias"
> #ifdef CONFIG_PPC32
> SYSCALL_DEFINE3(debug_setcontext, struct ucontext __user *, ctx,
> int, ndbg, struct sig_dbg_op __user *, dbg)
> @@ -1337,7 +1330,6 @@ SYSCALL_DEFINE3(debug_setcontext, struct ucontext __user *, ctx,
> return 0;
> }
> #endif
> -#pragma GCC diagnostic pop
>
> /*
> * OK, we're invoking a handler
> diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
> index d42b60020389..83d51bf586c7 100644
> --- a/arch/powerpc/kernel/signal_64.c
> +++ b/arch/powerpc/kernel/signal_64.c
> @@ -625,9 +625,6 @@ static long setup_trampoline(unsigned int syscall, unsigned int __user *tramp)
> /*
> * Handle {get,set,swap}_context operations
> */
> -#pragma GCC diagnostic push
> -#pragma GCC diagnostic ignored "-Wpragmas"
> -#pragma GCC diagnostic ignored "-Wattribute-alias"
> SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx,
> struct ucontext __user *, new_ctx, long, ctx_size)
> {
> @@ -693,7 +690,6 @@ SYSCALL_DEFINE3(swapcontext, struct ucontext __user *, old_ctx,
> set_thread_flag(TIF_RESTOREALL);
> return 0;
> }
> -#pragma GCC diagnostic pop
>
>
> /*
> diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
> index 083fa06962fd..466216506eb2 100644
> --- a/arch/powerpc/kernel/syscalls.c
> +++ b/arch/powerpc/kernel/syscalls.c
> @@ -62,9 +62,6 @@ static inline long do_mmap2(unsigned long addr, size_t len,
> return ret;
> }
>
> -#pragma GCC diagnostic push
> -#pragma GCC diagnostic ignored "-Wpragmas"
> -#pragma GCC diagnostic ignored "-Wattribute-alias"
> SYSCALL_DEFINE6(mmap2, unsigned long, addr, size_t, len,
> unsigned long, prot, unsigned long, flags,
> unsigned long, fd, unsigned long, pgoff)
> @@ -78,7 +75,6 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, size_t, len,
> {
> return do_mmap2(addr, len, prot, flags, fd, offset, PAGE_SHIFT);
> }
> -#pragma GCC diagnostic pop
>
> #ifdef CONFIG_PPC32
> /*
> diff --git a/arch/powerpc/mm/subpage-prot.c b/arch/powerpc/mm/subpage-prot.c
> index 75cb646a79c3..9d16ee251fc0 100644
> --- a/arch/powerpc/mm/subpage-prot.c
> +++ b/arch/powerpc/mm/subpage-prot.c
> @@ -186,9 +186,6 @@ static void subpage_mark_vma_nohuge(struct mm_struct *mm, unsigned long addr,
> * in a 2-bit field won't allow writes to a page that is otherwise
> * write-protected.
> */
> -#pragma GCC diagnostic push
> -#pragma GCC diagnostic ignored "-Wpragmas"
> -#pragma GCC diagnostic ignored "-Wattribute-alias"
> SYSCALL_DEFINE3(subpage_prot, unsigned long, addr,
> unsigned long, len, u32 __user *, map)
> {
> @@ -272,4 +269,3 @@ SYSCALL_DEFINE3(subpage_prot, unsigned long, addr,
> up_write(&mm->mmap_sem);
> return err;
> }
> -#pragma GCC diagnostic pop
>
Powered by blists - more mailing lists