From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759557AbcLRIJi (ORCPT ); Sun, 18 Dec 2016 03:09:38 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:34192 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754122AbcLRIJg (ORCPT ); Sun, 18 Dec 2016 03:09:36 -0500 Date: Sun, 18 Dec 2016 09:00:28 +0100 From: Ingo Molnar To: Kees Cook Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Subject: Re: [PATCH v2] x86/floppy: use designated initializers Message-ID: <20161218080028.GA18591@gmail.com> References: <20161217213705.GA1248@beast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161217213705.GA1248@beast> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Kees Cook 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 > --- > v2: > - aligned rhs of initializer, ingo > --- > 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..202fe3e1fae8 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 That's not how we organize named initializers, we do: ._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 I have fixed up the patch. Thanks, Ingo