net: qed: fix the array may be out of bound
authorzhangyue <zhangyue1@kylinos.cn>
Thu, 25 Nov 2021 11:36:10 +0000 (19:36 +0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 26 Nov 2021 19:29:20 +0000 (11:29 -0800)
If the variable 'p_bit->flags' is always 0,
the loop condition is always 0.

The variable 'j' may be greater than or equal to 32.

At this time, the array 'p_aeu->bits[32]' may be out
of bound.

Signed-off-by: zhangyue <zhangyue1@kylinos.cn>
Link: https://lore.kernel.org/r/20211125113610.273841-1-zhangyue1@kylinos.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/qlogic/qed/qed_int.c

index a97f691839e04f10a14e564cb667bb541904f27c..6958adeca86d0e6c413115be436e1f0720307b1c 100644 (file)
@@ -1045,7 +1045,7 @@ static int qed_int_deassertion(struct qed_hwfn  *p_hwfn,
                if (!parities)
                        continue;
 
-               for (j = 0, bit_idx = 0; bit_idx < 32; j++) {
+               for (j = 0, bit_idx = 0; bit_idx < 32 && j < 32; j++) {
                        struct aeu_invert_reg_bit *p_bit = &p_aeu->bits[j];
 
                        if (qed_int_is_parity_flag(p_hwfn, p_bit) &&
@@ -1083,7 +1083,7 @@ static int qed_int_deassertion(struct qed_hwfn  *p_hwfn,
                         * to current group, making them responsible for the
                         * previous assertion.
                         */
-                       for (j = 0, bit_idx = 0; bit_idx < 32; j++) {
+                       for (j = 0, bit_idx = 0; bit_idx < 32 && j < 32; j++) {
                                long unsigned int bitmask;
                                u8 bit, bit_len;
 
@@ -1382,7 +1382,7 @@ static void qed_int_sb_attn_init(struct qed_hwfn *p_hwfn,
        memset(sb_info->parity_mask, 0, sizeof(u32) * NUM_ATTN_REGS);
        for (i = 0; i < NUM_ATTN_REGS; i++) {
                /* j is array index, k is bit index */
-               for (j = 0, k = 0; k < 32; j++) {
+               for (j = 0, k = 0; k < 32 && j < 32; j++) {
                        struct aeu_invert_reg_bit *p_aeu;
 
                        p_aeu = &aeu_descs[i].bits[j];