Skip to content

Commit 14807b4

Browse files
tititiou36martinkpetersen
authored andcommitted
scsi: Constify struct pci_error_handlers
'struct pci_error_handlers' 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. On a x86_64, with allmodconfig, as an example: Before: ====== text data bss dec hex filename 39049 6429 112 45590 b216 drivers/scsi/aacraid/linit.o After: ===== text data bss dec hex filename 39113 6365 112 45590 b216 drivers/scsi/aacraid/linit.o Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/efdec8425981e10fc398fa2ac599c9c45d930561.1737318548.git.christophe.jaillet@wanadoo.fr Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 2014c95 commit 14807b4

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

drivers/scsi/aacraid/linit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2029,7 +2029,7 @@ static void aac_pci_resume(struct pci_dev *pdev)
20292029
dev_err(&pdev->dev, "aacraid: PCI error - resume\n");
20302030
}
20312031

2032-
static struct pci_error_handlers aac_pci_err_handler = {
2032+
static const struct pci_error_handlers aac_pci_err_handler = {
20332033
.error_detected = aac_pci_error_detected,
20342034
.mmio_enabled = aac_pci_mmio_enabled,
20352035
.slot_reset = aac_pci_slot_reset,

drivers/scsi/be2iscsi/be_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5776,7 +5776,7 @@ static void beiscsi_remove(struct pci_dev *pcidev)
57765776
}
57775777

57785778

5779-
static struct pci_error_handlers beiscsi_eeh_handlers = {
5779+
static const struct pci_error_handlers beiscsi_eeh_handlers = {
57805780
.error_detected = beiscsi_eeh_err_detected,
57815781
.slot_reset = beiscsi_eeh_reset,
57825782
.resume = beiscsi_eeh_resume,

drivers/scsi/bfa/bfad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1642,7 +1642,7 @@ MODULE_DEVICE_TABLE(pci, bfad_id_table);
16421642
/*
16431643
* PCI error recovery handlers.
16441644
*/
1645-
static struct pci_error_handlers bfad_err_handler = {
1645+
static const struct pci_error_handlers bfad_err_handler = {
16461646
.error_detected = bfad_pci_error_detected,
16471647
.slot_reset = bfad_pci_slot_reset,
16481648
.mmio_enabled = bfad_pci_mmio_enabled,

drivers/scsi/csiostor/csio_init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ csio_pci_resume(struct pci_dev *pdev)
11621162
dev_err(&pdev->dev, "resume of device failed: %d\n", rv);
11631163
}
11641164

1165-
static struct pci_error_handlers csio_err_handler = {
1165+
static const struct pci_error_handlers csio_err_handler = {
11661166
.error_detected = csio_pci_error_detected,
11671167
.slot_reset = csio_pci_slot_reset,
11681168
.resume = csio_pci_resume,

drivers/scsi/elx/efct/efct_driver.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ efct_pci_io_resume(struct pci_dev *pdev)
735735

736736
MODULE_DEVICE_TABLE(pci, efct_pci_table);
737737

738-
static struct pci_error_handlers efct_pci_err_handler = {
738+
static const struct pci_error_handlers efct_pci_err_handler = {
739739
.error_detected = efct_pci_io_error_detected,
740740
.slot_reset = efct_pci_io_slot_reset,
741741
.resume = efct_pci_io_resume,

drivers/scsi/mpi3mr/mpi3mr_os.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5803,7 +5803,7 @@ static const struct pci_device_id mpi3mr_pci_id_table[] = {
58035803
};
58045804
MODULE_DEVICE_TABLE(pci, mpi3mr_pci_id_table);
58055805

5806-
static struct pci_error_handlers mpi3mr_err_handler = {
5806+
static const struct pci_error_handlers mpi3mr_err_handler = {
58075807
.error_detected = mpi3mr_pcierr_error_detected,
58085808
.mmio_enabled = mpi3mr_pcierr_mmio_enabled,
58095809
.slot_reset = mpi3mr_pcierr_slot_reset,

drivers/scsi/mpt3sas/mpt3sas_scsih.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12710,7 +12710,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
1271012710
};
1271112711
MODULE_DEVICE_TABLE(pci, mpt3sas_pci_table);
1271212712

12713-
static struct pci_error_handlers _mpt3sas_err_handler = {
12713+
static const struct pci_error_handlers _mpt3sas_err_handler = {
1271412714
.error_detected = scsih_pci_error_detected,
1271512715
.mmio_enabled = scsih_pci_mmio_enabled,
1271612716
.slot_reset = scsih_pci_slot_reset,

drivers/scsi/qedi/qedi_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2876,7 +2876,7 @@ MODULE_DEVICE_TABLE(pci, qedi_pci_tbl);
28762876

28772877
static enum cpuhp_state qedi_cpuhp_state;
28782878

2879-
static struct pci_error_handlers qedi_err_handler = {
2879+
static const struct pci_error_handlers qedi_err_handler = {
28802880
.error_detected = qedi_io_error_detected,
28812881
};
28822882

0 commit comments

Comments
 (0)