x86/floppy: Use designated initializers

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 <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: http://lkml.kernel.org/r/20161217213705.GA1248@beast
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
index 1c7eefe3250295762c258a66af22a05d53882334..7ec59edde154c344cb5bfce7ba586360a6d32d19 100644 (file)
--- 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
        }
 };