* [PATCH v2] x86/floppy: use designated initializers
@ 2016-12-17 21:37 Kees Cook
2016-12-18 8:00 ` Ingo Molnar
2016-12-18 8:28 ` [tip:x86/urgent] x86/floppy: Use " tip-bot for Kees Cook
0 siblings, 2 replies; 4+ messages in thread
From: Kees Cook @ 2016-12-17 21:37 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>
---
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
}
};
--
2.7.4
--
Kees Cook
Nexus Security
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] x86/floppy: use designated initializers
2016-12-17 21:37 [PATCH v2] x86/floppy: use designated initializers Kees Cook
@ 2016-12-18 8:00 ` Ingo Molnar
2016-12-20 17:02 ` Kees Cook
2016-12-18 8:28 ` [tip:x86/urgent] x86/floppy: Use " tip-bot for Kees Cook
1 sibling, 1 reply; 4+ messages in thread
From: Ingo Molnar @ 2016-12-18 8:00 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>
> ---
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:x86/urgent] x86/floppy: Use designated initializers
2016-12-17 21:37 [PATCH v2] x86/floppy: use designated initializers Kees Cook
2016-12-18 8:00 ` Ingo Molnar
@ 2016-12-18 8:28 ` tip-bot for Kees Cook
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Kees Cook @ 2016-12-18 8:28 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, peterz, keescook, torvalds, tglx, mingo, hpa
Commit-ID: ffc7dc8d838c6403a550021e4f28a737334d80a7
Gitweb: http://git.kernel.org/tip/ffc7dc8d838c6403a550021e4f28a737334d80a7
Author: Kees Cook <keescook@chromium.org>
AuthorDate: Sat, 17 Dec 2016 13:37:05 -0800
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sun, 18 Dec 2016 09:25:38 +0100
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 <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20161217213705.GA1248@beast
Signed-off-by: Ingo Molnar <mingo@kernel.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 1c7eefe..7ec59ed 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
}
};
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] x86/floppy: use designated initializers
2016-12-18 8:00 ` Ingo Molnar
@ 2016-12-20 17:02 ` Kees Cook
0 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2016-12-20 17:02 UTC (permalink / raw)
To: Ingo Molnar; +Cc: LKML, Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86
On Sun, Dec 18, 2016 at 12:00 AM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * 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>
>> ---
>> 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.
Ah-ha, thanks! When I did this patch, I first went looking through the
source but there didn't seem to be a consensus on where to put the
"=". :P Thanks for fixing it up!
-Kees
--
Kees Cook
Nexus Security
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-12-20 17:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-17 21:37 [PATCH v2] x86/floppy: use designated initializers Kees Cook
2016-12-18 8:00 ` Ingo Molnar
2016-12-20 17:02 ` Kees Cook
2016-12-18 8:28 ` [tip:x86/urgent] x86/floppy: Use " tip-bot for Kees Cook
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).