Skip to content

Commit 5d1cf9f

Browse files
Chandrakanth Patilroot
authored andcommitted
scsi: Constify struct pci_error_handlers
JIRA: https://issues.redhat.com/browse/RHEL-81907 '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> (cherry picked from commit 14807b4) Signed-off-by: Chandrakanth Patil <chanpati@redhat.com>
1 parent 386c271 commit 5d1cf9f

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
@@ -2023,7 +2023,7 @@ static void aac_pci_resume(struct pci_dev *pdev)
20232023
dev_err(&pdev->dev, "aacraid: PCI error - resume\n");
20242024
}
20252025

2026-
static struct pci_error_handlers aac_pci_err_handler = {
2026+
static const struct pci_error_handlers aac_pci_err_handler = {
20272027
.error_detected = aac_pci_error_detected,
20282028
.mmio_enabled = aac_pci_mmio_enabled,
20292029
.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
@@ -5775,7 +5775,7 @@ static void beiscsi_remove(struct pci_dev *pcidev)
57755775
}
57765776

57775777

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

drivers/scsi/bfa/bfad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1668,7 +1668,7 @@ MODULE_DEVICE_TABLE(pci, bfad_id_table);
16681668
/*
16691669
* PCI error recovery handlers.
16701670
*/
1671-
static struct pci_error_handlers bfad_err_handler = {
1671+
static const struct pci_error_handlers bfad_err_handler = {
16721672
.error_detected = bfad_pci_error_detected,
16731673
.slot_reset = bfad_pci_slot_reset,
16741674
.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
@@ -1161,7 +1161,7 @@ csio_pci_resume(struct pci_dev *pdev)
11611161
dev_err(&pdev->dev, "resume of device failed: %d\n", rv);
11621162
}
11631163

1164-
static struct pci_error_handlers csio_err_handler = {
1164+
static const struct pci_error_handlers csio_err_handler = {
11651165
.error_detected = csio_pci_error_detected,
11661166
.slot_reset = csio_pci_slot_reset,
11671167
.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
@@ -739,7 +739,7 @@ efct_pci_io_resume(struct pci_dev *pdev)
739739

740740
MODULE_DEVICE_TABLE(pci, efct_pci_table);
741741

742-
static struct pci_error_handlers efct_pci_err_handler = {
742+
static const struct pci_error_handlers efct_pci_err_handler = {
743743
.error_detected = efct_pci_io_error_detected,
744744
.slot_reset = efct_pci_io_slot_reset,
745745
.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
@@ -12747,7 +12747,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
1274712747
};
1274812748
MODULE_DEVICE_TABLE(pci, mpt3sas_pci_table);
1274912749

12750-
static struct pci_error_handlers _mpt3sas_err_handler = {
12750+
static const struct pci_error_handlers _mpt3sas_err_handler = {
1275112751
.error_detected = scsih_pci_error_detected,
1275212752
.mmio_enabled = scsih_pci_mmio_enabled,
1275312753
.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
@@ -2877,7 +2877,7 @@ MODULE_DEVICE_TABLE(pci, qedi_pci_tbl);
28772877

28782878
static enum cpuhp_state qedi_cpuhp_state;
28792879

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

0 commit comments

Comments
 (0)