fbdev: Constify struct sbus_mmap_map

tititiou36 · hdeller · commit 161e95b899a6 · 2024-10-15T10:07:32.000+02:00
'struct sbus_mmap_map' are not modified in these drivers.

Constifying this structure moves some data to a read-only section, so
increases overall security.

Update sbusfb_mmap_helper() accordingly.

On a x86_64, with allmodconfig, as an example:
Before:
======
   text	   data	    bss	    dec	    hex	filename
   2452	    536	     16	   3004	    bbc	drivers/video/fbdev/bw2.o

After:
=====
   text	   data	    bss	    dec	    hex	filename
   2500	    483	     16	   2999	    bb7	drivers/video/fbdev/bw2.o

Signed-off-by: Christophe JAILLET &lt;christophe.jaillet@wanadoo.fr&gt;
Signed-off-by: Helge Deller &lt;deller@gmx.de&gt;
diff --git a/drivers/video/fbdev/bw2.c b/drivers/video/fbdev/bw2.c
@@ -147,7 +147,7 @@ bw2_blank(int blank, struct fb_info *info)
 	return 0;
 }
 
-static struct sbus_mmap_map bw2_mmap_map[] = {
+static const struct sbus_mmap_map bw2_mmap_map[] = {
 	{
 		.size = SBUS_MMAP_FBSIZE(1)
 	},
diff --git a/drivers/video/fbdev/cg14.c b/drivers/video/fbdev/cg14.c
@@ -360,7 +360,7 @@ static void cg14_init_fix(struct fb_info *info, int linebytes,
 	info->fix.accel = FB_ACCEL_SUN_CG14;
 }
 
-static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] = {
+static const struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] = {
 	{
 		.voff	= CG14_REGS,
 		.poff	= 0x80000000,
diff --git a/drivers/video/fbdev/cg3.c b/drivers/video/fbdev/cg3.c
@@ -209,7 +209,7 @@ static int cg3_blank(int blank, struct fb_info *info)
 	return 0;
 }
 
-static struct sbus_mmap_map cg3_mmap_map[] = {
+static const struct sbus_mmap_map cg3_mmap_map[] = {
 	{
 		.voff	= CG3_MMAP_OFFSET,
 		.poff	= CG3_RAM_OFFSET,
diff --git a/drivers/video/fbdev/cg6.c b/drivers/video/fbdev/cg6.c
@@ -545,7 +545,7 @@ static int cg6_blank(int blank, struct fb_info *info)
 	return 0;
 }
 
-static struct sbus_mmap_map cg6_mmap_map[] = {
+static const struct sbus_mmap_map cg6_mmap_map[] = {
 	{
 		.voff	= CG6_FBC,
 		.poff	= CG6_FBC_OFFSET,
diff --git a/drivers/video/fbdev/ffb.c b/drivers/video/fbdev/ffb.c
@@ -710,7 +710,7 @@ static int ffb_blank(int blank, struct fb_info *info)
 	return 0;
 }
 
-static struct sbus_mmap_map ffb_mmap_map[] = {
+static const struct sbus_mmap_map ffb_mmap_map[] = {
 	{
 		.voff	= FFB_SFB8R_VOFF,
 		.poff	= FFB_SFB8R_POFF,
diff --git a/drivers/video/fbdev/leo.c b/drivers/video/fbdev/leo.c
@@ -338,7 +338,7 @@ static int leo_blank(int blank, struct fb_info *info)
 	return 0;
 }
 
-static struct sbus_mmap_map leo_mmap_map[] = {
+static const struct sbus_mmap_map leo_mmap_map[] = {
 	{
 		.voff	= LEO_SS0_MAP,
 		.poff	= LEO_OFF_SS0,
diff --git a/drivers/video/fbdev/p9100.c b/drivers/video/fbdev/p9100.c
@@ -206,7 +206,7 @@ p9100_blank(int blank, struct fb_info *info)
 	return 0;
 }
 
-static struct sbus_mmap_map p9100_mmap_map[] = {
+static const struct sbus_mmap_map p9100_mmap_map[] = {
 	{ CG3_MMAP_OFFSET,	0,		SBUS_MMAP_FBSIZE(1) },
 	{ 0,			0,		0		    }
 };
diff --git a/drivers/video/fbdev/sbuslib.c b/drivers/video/fbdev/sbuslib.c
@@ -38,7 +38,7 @@ static unsigned long sbusfb_mmapsize(long size, unsigned long fbsize)
 	return fbsize * (-size);
 }
 
-int sbusfb_mmap_helper(struct sbus_mmap_map *map,
+int sbusfb_mmap_helper(const struct sbus_mmap_map *map,
 		       unsigned long physbase,
 		       unsigned long fbsize,
 		       unsigned long iospace,
diff --git a/drivers/video/fbdev/sbuslib.h b/drivers/video/fbdev/sbuslib.h
@@ -19,7 +19,7 @@ struct sbus_mmap_map {
 
 extern void sbusfb_fill_var(struct fb_var_screeninfo *var,
 			    struct device_node *dp, int bpp);
-extern int sbusfb_mmap_helper(struct sbus_mmap_map *map,
+extern int sbusfb_mmap_helper(const struct sbus_mmap_map *map,
 			      unsigned long physbase, unsigned long fbsize,
 			      unsigned long iospace,
 			      struct vm_area_struct *vma);
diff --git a/drivers/video/fbdev/tcx.c b/drivers/video/fbdev/tcx.c
@@ -236,7 +236,7 @@ tcx_blank(int blank, struct fb_info *info)
 	return 0;
 }
 
-static struct sbus_mmap_map __tcx_mmap_map[TCX_MMAP_ENTRIES] = {
+static const struct sbus_mmap_map __tcx_mmap_map[TCX_MMAP_ENTRIES] = {
 	{
 		.voff	= TCX_RAM8BIT,
 		.size	= SBUS_MMAP_FBSIZE(1)

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ bw2_blank(int blank, struct fb_info *info)`
`147`	`147`	`return 0;`
`148`	`148`	`}`
`149`	`149`
`150`		`-static struct sbus_mmap_map bw2_mmap_map[] = {`
	`150`	`+static const struct sbus_mmap_map bw2_mmap_map[] = {`
`151`	`151`	`{`
`152`	`152`	`.size = SBUS_MMAP_FBSIZE(1)`
`153`	`153`	`},`
Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ static void cg14_init_fix(struct fb_info *info, int linebytes,`
`360`	`360`	`info->fix.accel = FB_ACCEL_SUN_CG14;`
`361`	`361`	`}`
`362`	`362`
`363`		`-static struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] = {`
	`363`	`+static const struct sbus_mmap_map __cg14_mmap_map[CG14_MMAP_ENTRIES] = {`
`364`	`364`	`{`
`365`	`365`	`.voff = CG14_REGS,`
`366`	`366`	`.poff = 0x80000000,`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ static int cg3_blank(int blank, struct fb_info *info)`
`209`	`209`	`return 0;`
`210`	`210`	`}`
`211`	`211`
`212`		`-static struct sbus_mmap_map cg3_mmap_map[] = {`
	`212`	`+static const struct sbus_mmap_map cg3_mmap_map[] = {`
`213`	`213`	`{`
`214`	`214`	`.voff = CG3_MMAP_OFFSET,`
`215`	`215`	`.poff = CG3_RAM_OFFSET,`
Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ static int cg6_blank(int blank, struct fb_info *info)`
`545`	`545`	`return 0;`
`546`	`546`	`}`
`547`	`547`
`548`		`-static struct sbus_mmap_map cg6_mmap_map[] = {`
	`548`	`+static const struct sbus_mmap_map cg6_mmap_map[] = {`
`549`	`549`	`{`
`550`	`550`	`.voff = CG6_FBC,`
`551`	`551`	`.poff = CG6_FBC_OFFSET,`
Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,7 @@ static int ffb_blank(int blank, struct fb_info *info)`
`710`	`710`	`return 0;`
`711`	`711`	`}`
`712`	`712`
`713`		`-static struct sbus_mmap_map ffb_mmap_map[] = {`
	`713`	`+static const struct sbus_mmap_map ffb_mmap_map[] = {`
`714`	`714`	`{`
`715`	`715`	`.voff = FFB_SFB8R_VOFF,`
`716`	`716`	`.poff = FFB_SFB8R_POFF,`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ static int leo_blank(int blank, struct fb_info *info)`
`338`	`338`	`return 0;`
`339`	`339`	`}`
`340`	`340`
`341`		`-static struct sbus_mmap_map leo_mmap_map[] = {`
	`341`	`+static const struct sbus_mmap_map leo_mmap_map[] = {`
`342`	`342`	`{`
`343`	`343`	`.voff = LEO_SS0_MAP,`
`344`	`344`	`.poff = LEO_OFF_SS0,`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ p9100_blank(int blank, struct fb_info *info)`
`206`	`206`	`return 0;`
`207`	`207`	`}`
`208`	`208`
`209`		`-static struct sbus_mmap_map p9100_mmap_map[] = {`
	`209`	`+static const struct sbus_mmap_map p9100_mmap_map[] = {`
`210`	`210`	`{ CG3_MMAP_OFFSET, 0, SBUS_MMAP_FBSIZE(1) },`
`211`	`211`	`{ 0, 0, 0 }`
`212`	`212`	`};`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ static unsigned long sbusfb_mmapsize(long size, unsigned long fbsize)`
`38`	`38`	`return fbsize * (-size);`
`39`	`39`	`}`
`40`	`40`
`41`		`-int sbusfb_mmap_helper(struct sbus_mmap_map *map,`
	`41`	`+int sbusfb_mmap_helper(const struct sbus_mmap_map *map,`
`42`	`42`	`unsigned long physbase,`
`43`	`43`	`unsigned long fbsize,`
`44`	`44`	`unsigned long iospace,`
Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ tcx_blank(int blank, struct fb_info *info)`
`236`	`236`	`return 0;`
`237`	`237`	`}`
`238`	`238`
`239`		`-static struct sbus_mmap_map __tcx_mmap_map[TCX_MMAP_ENTRIES] = {`
	`239`	`+static const struct sbus_mmap_map __tcx_mmap_map[TCX_MMAP_ENTRIES] = {`
`240`	`240`	`{`
`241`	`241`	`.voff = TCX_RAM8BIT,`
`242`	`242`	`.size = SBUS_MMAP_FBSIZE(1)`