kernel: dma: Make CMA boot parameters __ro_after_init
Subsystems (2)
PATCH 1/1 kernel: dma: Make CMA boot parameters __ro_after_init
This parameters are not changed after early boot.
By making them __ro_after_init will reduce any attack surface in the kernel.
--- kernel/dma/contiguous.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
kernel/dma/contiguous.c +4 -4
@@ -42,10 +42,10 @@ struct cma *dma_contiguous_default_area;* Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; -static phys_addr_t size_cmdline =-1 ; -static phys_addr_t base_cmdline; -static phys_addr_t limit_cmdline; +static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; +static phys_addr_t __ro_after_init size_cmdline =-1 ; +static phys_addr_t __ro_after_init base_cmdline; +static phys_addr_t __ro_after_init limit_cmdline;static int __init early_cma (char *p) {
Signature · 1 line
2.20.1
Quoted 21 lines · Shyam Saini
This parameters are not changed after early boot.
By making them__ro_after_initwill reduce any attack surface in the kernel.Cc Christoph Hellwig <[email protected]>Cc Marek Szyprowski <[email protected]>Cc Robin Murphy <[email protected]>Cc Matthew Wilcox <[email protected]>Cc Christopher Lameter <[email protected]>Cc Kees Cook <[email protected]>Signed-off-by Shyam Saini <[email protected]>--- kernel/dma/contiguous.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)kernel/dma/contiguous.c +0
-0
kernel/dma/contiguous.c struct cma *dma_contiguous_default_area; · line 45
Quoted 8 lines
kernel/dma/contiguous.c +1
-4@@ -42,10 +42,10 @@ struct cma *dma_contiguous_default_area;* Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; -static phys_addr_t size_cmdline =-1 ; -static phys_addr_t base_cmdline; -static phys_addr_t limit_cmdline; +static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ;
The 0day bot reported an issue with this change with clang:
https://groups.google.com/d/msgid/clang-built-linux/201910140334.nhultlt8%25lkp%40intel.com
kernel/dma/contiguous.c:46:36: error: 'size_cmdline' causes a section type conflict with 'size_bytes'
static phys_addr_t __ro_after_init size_cmdline = -1;
^
kernel/dma/contiguous.c:45:42: note: declared here
static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M;
^
kernel/dma/contiguous.c:47:36: error: 'base_cmdline' causes a section type conflict with 'size_bytes'
static phys_addr_t __ro_after_init base_cmdline;
^
kernel/dma/contiguous.c:45:42: note: declared here
static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M;
^
kernel/dma/contiguous.c:48:36: error: 'limit_cmdline' causes a section type conflict with 'size_bytes'
static phys_addr_t __ro_after_init limit_cmdline;
^
kernel/dma/contiguous.c:45:42: note: declared here
static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M;
^3 errors generated.
The errors seem kind of cryptic at first but something that is const should automatically be in the read only section, this part of the commit seems unnecessary. Removing that part of the change fixes the error.
Cheers,
Nathan
Hi Nathan,
Quoted 54 lines · Nathan Chancellor
Quoted 21 lines · Shyam Saini
This parameters are not changed after early boot.
By making them__ro_after_initwill reduce any attack surface in the kernel.Cc Christoph Hellwig <[email protected]>Cc Marek Szyprowski <[email protected]>Cc Robin Murphy <[email protected]>Cc Matthew Wilcox <[email protected]>Cc Christopher Lameter <[email protected]>Cc Kees Cook <[email protected]>Signed-off-by Shyam Saini <[email protected]>--- kernel/dma/contiguous.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)kernel/dma/contiguous.c +0
-0kernel/dma/contiguous.c struct cma *dma_contiguous_default_area; · line 45
Quoted 8 lines
kernel/dma/contiguous.c +1
-4@@ -42,10 +42,10 @@ struct cma *dma_contiguous_default_area;* Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; -static phys_addr_t size_cmdline =-1 ; -static phys_addr_t base_cmdline; -static phys_addr_t limit_cmdline; +static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ;The 0day bot reported an issue with this change with clang:
https://groups.google.com/d/msgid/clang-built-linux/201910140334.nhultlt8%25lkp%40intel.com
kernel/dma/contiguous.c:46:36: error: 'size_cmdline' causes a section type conflict with 'size_bytes'static phys_addr_t __ro_after_init size_cmdline = -1; ^ kernel/dma/contiguous.c:45:42: note: declared here static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M; ^ kernel/dma/contiguous.c:47:36: error: 'base_cmdline' causes a section type conflict with 'size_bytes' static phys_addr_t __ro_after_init base_cmdline; ^ kernel/dma/contiguous.c:45:42: note: declared here static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M; ^ kernel/dma/contiguous.c:48:36: error: 'limit_cmdline' causes a section type conflict with 'size_bytes' static phys_addr_t __ro_after_init limit_cmdline; ^ kernel/dma/contiguous.c:45:42: note: declared here static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t)CMA_SIZE_MBYTES * SZ_1M; ^
Quoted 1 line
3 errors generated.
Thanks for your feedback and reporting this error.
Quoted 3 lines
The errors seem kind of cryptic at first but something that is const should automatically be in the read only section, this part of the commit seems unnecessary. Removing that part of the change fixes the error.
I have overlooked size_bytes variable
It shouldn't be const if it is declared as __ro_after_init.
I will fix and resend it.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Robin Murphy
reviewerQuoted 3 lines · Shyam Saini
This parameters are not changed after early boot.
By making them__ro_after_initwill reduce any attack surface in the kernel.
At a glance, it looks like these are only referenced by a couple of __init functions, so couldn't they just be __initdata/__initconst?
Robin.
Quoted 32 lines
Cc Christoph Hellwig <[email protected]>Cc Marek Szyprowski <[email protected]>Cc Robin Murphy <[email protected]>Cc Matthew Wilcox <[email protected]>Cc Christopher Lameter <[email protected]>Cc Kees Cook <[email protected]>Signed-off-by Shyam Saini <[email protected]>--- kernel/dma/contiguous.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)kernel/dma/contiguous.c +4
-4@@ -42,10 +42,10 @@ struct cma *dma_contiguous_default_area;* Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; -static phys_addr_t size_cmdline =-1 ; -static phys_addr_t base_cmdline; -static phys_addr_t limit_cmdline; +static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; +static phys_addr_t __ro_after_init size_cmdline =-1 ; +static phys_addr_t __ro_after_init base_cmdline; +static phys_addr_t __ro_after_init limit_cmdline;static int __init early_cma (char *p) {
Hi Robin,
Sorry for the late reply.
Quoted 6 lines
This parameters are not changed after early boot.
Quoted 2 lines
By making them
__ro_after_initwill reduce any attack surface in the kernel.At a glance, it looks like these are only referenced by a couple of
__initfunctions, so couldn't they just be __initdata/__initconst?
yes, You are right it is only used by __init calls and not used anywhere else.
I will resend the updated version.
Thanks a lot for the feedback.
Quoted 32 lines
Quoted 32 lines
Cc Christoph Hellwig <[email protected]>Cc Marek Szyprowski <[email protected]>Cc Robin Murphy <[email protected]>Cc Matthew Wilcox <[email protected]>Cc Christopher Lameter <[email protected]>Cc Kees Cook <[email protected]>Signed-off-by Shyam Saini <[email protected]>--- kernel/dma/contiguous.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)kernel/dma/contiguous.c +4
-4@@ -42,10 +42,10 @@ struct cma *dma_contiguous_default_area;* Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; -static phys_addr_t size_cmdline =-1 ; -static phys_addr_t base_cmdline; -static phys_addr_t limit_cmdline; +static const phys_addr_t __ro_after_init size_bytes = (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; +static phys_addr_t __ro_after_init size_cmdline =-1 ; +static phys_addr_t __ro_after_init base_cmdline; +static phys_addr_t __ro_after_init limit_cmdline;static int __init early_cma (char *p) {