Commit dbf0fa1c authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

usb-storage: Constify struct usb_device_id and us_unusual_dev 



'struct usb_device_id' and 'struct us_unusual_dev' are not modified in
these drivers.

Constifying these structures moves some data to a read-only section, so
increase overall security, especially when the structure holds some
function pointers (which is the case for struct us_unusual_dev).

On a x86_64, with allmodconfig, as an example:
Before:
======
   text	   data	    bss	    dec	    hex	filename
  25249	   4261	    896	  30406	   76c6	drivers/usb/storage/alauda.o
   3969	    672	    360	   5001	   1389	drivers/usb/storage/cypress_atacb.o

After:
=====
   text	   data	    bss	    dec	    hex	filename
  25461	   4041	    896	  30398	   76be	drivers/usb/storage/alauda.o
   4225	    400	    360	   4985	   1379	drivers/usb/storage/cypress_atacb.o

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/b1b75a2a64b1f6cfad2a611f71393f281178fd3f.1724507157.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4fdcc10

drivers/usb/storage/alauda.c

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int init_alauda(struct us_data *us); 
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \

  .driver_info = (flags) }



static struct usb_device_id alauda_usb_ids[] = {

static const struct usb_device_id alauda_usb_ids[] = {

#	include "unusual_alauda.h"

	{ }		/* Terminating entry */

};
@@ -154,7 +154,7 @@ MODULE_DEVICE_TABLE(usb, alauda_usb_ids); 
	.initFunction = init_function,	\

}



static struct us_unusual_dev alauda_unusual_dev_list[] = {

static const struct us_unusual_dev alauda_unusual_dev_list[] = {

#	include "unusual_alauda.h"

	{ }		/* Terminating entry */

};

drivers/usb/storage/cypress_atacb.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ MODULE_IMPORT_NS(USB_STORAGE); 
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \

  .driver_info = (flags) }



static struct usb_device_id cypress_usb_ids[] = {

static const struct usb_device_id cypress_usb_ids[] = {

#	include "unusual_cypress.h"

	{ }		/* Terminating entry */

};
@@ -55,7 +55,7 @@ MODULE_DEVICE_TABLE(usb, cypress_usb_ids); 
	.initFunction = init_function,	\

}



static struct us_unusual_dev cypress_unusual_dev_list[] = {

static const struct us_unusual_dev cypress_unusual_dev_list[] = {

#	include "unusual_cypress.h"

	{ }		/* Terminating entry */

};

drivers/usb/storage/datafab.c

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int datafab_determine_lun(struct us_data *us, 
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \

  .driver_info = (flags) }



static struct usb_device_id datafab_usb_ids[] = {

static const struct usb_device_id datafab_usb_ids[] = {

#	include "unusual_datafab.h"

	{ }		/* Terminating entry */

};
@@ -102,7 +102,7 @@ MODULE_DEVICE_TABLE(usb, datafab_usb_ids); 
	.initFunction = init_function,	\

}



static struct us_unusual_dev datafab_unusual_dev_list[] = {

static const struct us_unusual_dev datafab_unusual_dev_list[] = {

#	include "unusual_datafab.h"

	{ }		/* Terminating entry */

};

drivers/usb/storage/ene_ub6250.c

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ MODULE_FIRMWARE(MS_RW_FIRMWARE); 
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \

	.driver_info = (flags)}



static struct usb_device_id ene_ub6250_usb_ids[] = {

static const struct usb_device_id ene_ub6250_usb_ids[] = {

#	include "unusual_ene_ub6250.h"

	{ }		/* Terminating entry */

};
@@ -65,7 +65,7 @@ MODULE_DEVICE_TABLE(usb, ene_ub6250_usb_ids); 
	.initFunction = init_function,	\

}



static struct us_unusual_dev ene_ub6250_unusual_dev_list[] = {

static const struct us_unusual_dev ene_ub6250_unusual_dev_list[] = {

#	include "unusual_ene_ub6250.h"

	{ }		/* Terminating entry */

};

drivers/usb/storage/freecom.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int init_freecom(struct us_data *us); 
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \

  .driver_info = (flags) }



static struct usb_device_id freecom_usb_ids[] = {

static const struct usb_device_id freecom_usb_ids[] = {

#	include "unusual_freecom.h"

	{ }		/* Terminating entry */

};
@@ -141,7 +141,7 @@ MODULE_DEVICE_TABLE(usb, freecom_usb_ids); 
	.initFunction = init_function,	\

}



static struct us_unusual_dev freecom_unusual_dev_list[] = {

static const struct us_unusual_dev freecom_unusual_dev_list[] = {

#	include "unusual_freecom.h"

	{ }		/* Terminating entry */

};