All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86/floppy: use designated initializers
@ 2016-12-17  1:05 Kees Cook
  2016-12-17 16:17 ` Ingo Molnar
  0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2016-12-17  1:05 UTC (permalink / raw)
  To: linux-kernel; +Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, Kees Cook

Prepare to mark sensitive kernel structures for randomization by making
sure they're using designated initializers. These were identified during
allyesconfig builds of x86, arm, and arm64, with most initializer fixes
extracted from grsecurity.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 arch/x86/include/asm/floppy.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
index 1c7eefe32502..d0e4702883b9 100644
--- a/arch/x86/include/asm/floppy.h
+++ b/arch/x86/include/asm/floppy.h
@@ -229,18 +229,18 @@ static struct fd_routine_l {
 	int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
 } fd_routine[] = {
 	{
-		request_dma,
-		free_dma,
-		get_dma_residue,
-		dma_mem_alloc,
-		hard_dma_setup
+		._request_dma = request_dma,
+		._free_dma = free_dma,
+		._get_dma_residue = get_dma_residue,
+		._dma_mem_alloc = dma_mem_alloc,
+		._dma_setup = hard_dma_setup
 	},
 	{
-		vdma_request_dma,
-		vdma_nop,
-		vdma_get_dma_residue,
-		vdma_mem_alloc,
-		vdma_dma_setup
+		._request_dma = vdma_request_dma,
+		._free_dma = vdma_nop,
+		._get_dma_residue = vdma_get_dma_residue,
+		._dma_mem_alloc = vdma_mem_alloc,
+		._dma_setup = vdma_dma_setup
 	}
 };
 
-- 
2.7.4


-- 
Kees Cook
Nexus Security

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] x86/floppy: use designated initializers
  2016-12-17  1:05 [PATCH] x86/floppy: use designated initializers Kees Cook
@ 2016-12-17 16:17 ` Ingo Molnar
  0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2016-12-17 16:17 UTC (permalink / raw)
  To: Kees Cook; +Cc: linux-kernel, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86


* Kees Cook <keescook@chromium.org> wrote:

> Prepare to mark sensitive kernel structures for randomization by making
> sure they're using designated initializers. These were identified during
> allyesconfig builds of x86, arm, and arm64, with most initializer fixes
> extracted from grsecurity.
> 
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
>  arch/x86/include/asm/floppy.h | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
> index 1c7eefe32502..d0e4702883b9 100644
> --- a/arch/x86/include/asm/floppy.h
> +++ b/arch/x86/include/asm/floppy.h
> @@ -229,18 +229,18 @@ static struct fd_routine_l {
>  	int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
>  } fd_routine[] = {
>  	{
> -		request_dma,
> -		free_dma,
> -		get_dma_residue,
> -		dma_mem_alloc,
> -		hard_dma_setup
> +		._request_dma = request_dma,
> +		._free_dma = free_dma,
> +		._get_dma_residue = get_dma_residue,
> +		._dma_mem_alloc = dma_mem_alloc,
> +		._dma_setup = hard_dma_setup
>  	},
>  	{
> -		vdma_request_dma,
> -		vdma_nop,
> -		vdma_get_dma_residue,
> -		vdma_mem_alloc,
> -		vdma_dma_setup
> +		._request_dma = vdma_request_dma,
> +		._free_dma = vdma_nop,
> +		._get_dma_residue = vdma_get_dma_residue,
> +		._dma_mem_alloc = vdma_mem_alloc,
> +		._dma_setup = vdma_dma_setup

Please align the two columns vertically while at it.

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-12-17 16:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-17  1:05 [PATCH] x86/floppy: use designated initializers Kees Cook
2016-12-17 16:17 ` Ingo Molnar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.