scsi: lpfc: Use struct_group to isolate cast to larger object

When building under -Warray-bounds, a warning is generated when casting a
u32 into MAILBOX_t (which is larger). This warning is conservative, but
it's not an unreasonable change to make to improve future robustness. Use a
tagged struct_group that can refer to either the specific fields or the
first u32 separately, silencing this warning:

drivers/scsi/lpfc/lpfc_sli.c: In function 'lpfc_reset_barrier':
drivers/scsi/lpfc/lpfc_sli.c:4787:29: error: array subscript 'MAILBOX_t[0]' is partly outside array bounds of 'volatile uint32_t[1]' {aka 'volatile unsigned int[1]'} [-Werror=array-bounds]
 4787 |         ((MAILBOX_t *)&mbox)->mbxCommand = MBX_KILL_BOARD;
      |                             ^~
drivers/scsi/lpfc/lpfc_sli.c:4752:27: note: while referencing 'mbox'
 4752 |         volatile uint32_t mbox;
      |                           ^~~~

There is no change to the resulting executable instruction code.

Link: https://lore.kernel.org/r/20211203223351.107323-1-keescook@chromium.org
Reviewed-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 61c9db31d9da007aec338a7693bc7c08e8b9158c..4461c3d6fc4f556f43b4f493b06b671095104024 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -3675,19 +3675,26 @@ union sli_var {
 };
 
 typedef struct {
+       struct_group_tagged(MAILBOX_word0, bits,
+               union {
+                       struct {
 #ifdef __BIG_ENDIAN_BITFIELD
-       uint16_t mbxStatus;
-       uint8_t mbxCommand;
-       uint8_t mbxReserved:6;
-       uint8_t mbxHc:1;
-       uint8_t mbxOwner:1;     /* Low order bit first word */
+                               uint16_t mbxStatus;
+                               uint8_t mbxCommand;
+                               uint8_t mbxReserved:6;
+                               uint8_t mbxHc:1;
+                               uint8_t mbxOwner:1;     /* Low order bit first word */
 #else  /*  __LITTLE_ENDIAN_BITFIELD */
-       uint8_t mbxOwner:1;     /* Low order bit first word */
-       uint8_t mbxHc:1;
-       uint8_t mbxReserved:6;
-       uint8_t mbxCommand;
-       uint16_t mbxStatus;
+                               uint8_t mbxOwner:1;     /* Low order bit first word */
+                               uint8_t mbxHc:1;
+                               uint8_t mbxReserved:6;
+                               uint8_t mbxCommand;
+                               uint16_t mbxStatus;
 #endif
+                       };
+                       u32 word0;
+               };
+       );
 
        MAILVARIANTS un;
        union sli_var us;

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 513a78d08b1d5a4d32bb80fd7a0e3a40f980225d..cd26c0f8c28148d4b7cd4b003c406484a53ef15b 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -4749,7 +4749,7 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
 {
        uint32_t __iomem *resp_buf;
        uint32_t __iomem *mbox_buf;
-       volatile uint32_t mbox;
+       volatile struct MAILBOX_word0 mbox;
        uint32_t hc_copy, ha_copy, resp_data;
        int  i;
        uint8_t hdrtype;
@@ -4783,13 +4783,13 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
                phba->pport->stopped = 1;
        }
 
-       mbox = 0;
-       ((MAILBOX_t *)&mbox)->mbxCommand = MBX_KILL_BOARD;
-       ((MAILBOX_t *)&mbox)->mbxOwner = OWN_CHIP;
+       mbox.word0 = 0;
+       mbox.mbxCommand = MBX_KILL_BOARD;
+       mbox.mbxOwner = OWN_CHIP;
 
        writel(BARRIER_TEST_PATTERN, (resp_buf + 1));
        mbox_buf = phba->MBslimaddr;
-       writel(mbox, mbox_buf);
+       writel(mbox.word0, mbox_buf);
 
        for (i = 0; i < 50; i++) {
                if (lpfc_readl((resp_buf + 1), &resp_data))
@@ -4810,12 +4810,12 @@ void lpfc_reset_barrier(struct lpfc_hba *phba)
                        goto clear_errat;
        }
 
-       ((MAILBOX_t *)&mbox)->mbxOwner = OWN_HOST;
+       mbox.mbxOwner = OWN_HOST;
        resp_data = 0;
        for (i = 0; i < 500; i++) {
                if (lpfc_readl(resp_buf, &resp_data))
                        return;
-               if (resp_data != mbox)
+               if (resp_data != mbox.word0)
                        mdelay(1);
                else
                        break;
@@ -5085,9 +5085,8 @@ lpfc_sli4_brdreset(struct lpfc_hba *phba)
 static int
 lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
 {
-       MAILBOX_t *mb;
+       volatile struct MAILBOX_word0 mb;
        struct lpfc_sli *psli;
-       volatile uint32_t word0;
        void __iomem *to_slim;
        uint32_t hba_aer_enabled;
 
@@ -5104,24 +5103,23 @@ lpfc_sli_brdrestart_s3(struct lpfc_hba *phba)
                        (phba->pport) ? phba->pport->port_state : 0,
                        psli->sli_flag);
 
-       word0 = 0;
-       mb = (MAILBOX_t *) &word0;
-       mb->mbxCommand = MBX_RESTART;
-       mb->mbxHc = 1;
+       mb.word0 = 0;
+       mb.mbxCommand = MBX_RESTART;
+       mb.mbxHc = 1;
 
        lpfc_reset_barrier(phba);
 
        to_slim = phba->MBslimaddr;
-       writel(*(uint32_t *) mb, to_slim);
+       writel(mb.word0, to_slim);
        readl(to_slim); /* flush */
 
        /* Only skip post after fc_ffinit is completed */
        if (phba->pport && phba->pport->port_state)
-               word0 = 1;      /* This is really setting up word1 */
+               mb.word0 = 1;   /* This is really setting up word1 */
        else
-               word0 = 0;      /* This is really setting up word1 */
+               mb.word0 = 0;   /* This is really setting up word1 */
        to_slim = phba->MBslimaddr + sizeof (uint32_t);
-       writel(*(uint32_t *) mb, to_slim);
+       writel(mb.word0, to_slim);
        readl(to_slim); /* flush */
 
        lpfc_sli_brdreset(phba);