Skip to contentSkip to conversation

sfc: a couple off by one bugs

PATCH In review Dan Carpenter 5 participants 7 messages Feb 1, 2017 – Feb 7, 2017

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sfc: a couple off by one bugs

These checks are off by one. These are just sanity checks and we don't ever pass invalid values for "encap_type" so it's harmless.

Fixes 9b4108012517 ("sfc: insert catch-all filters for encapsulated traffic")
drivers/net/ethernet/sfc/ef10.c +2 -2
index 8bec9383d754..dec0c8083ff3 100644
@@ -5080,7 +5080,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
 
 		/* quick bounds check (BCAST result impossible) */
 		BUILD_BUG_ON(EFX_EF10_BCAST != 0);
-		if (encap_type > ARRAY_SIZE(map) || map[encap_type] = 0) {
+		if (encap_type >= ARRAY_SIZE(map) || map[encap_type] = 0) {
 			WARN_ON(1);
 			return -EINVAL;
 		}
@@ -5134,7 +5134,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
 
 		/* quick bounds check (BCAST result impossible) */
 		BUILD_BUG_ON(EFX_EF10_BCAST != 0);
-		if (encap_type > ARRAY_SIZE(map) || map[encap_type] = 0) {
+		if (encap_type >= ARRAY_SIZE(map) || map[encap_type] = 0) {
 			WARN_ON(1);
 			return -EINVAL;
 		}
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Dan Carpenter

These checks are off by one. These are just sanity checks and we don't ever pass invalid values for "encap_type" so it's harmless.

Fixes 9b4108012517 ("sfc: insert catch-all filters for encapsulated traffic")

One of these was already fixed by Colin Ian King in e9904990e8e70a51574e6ec6b872f3c705ec75f0 ("sfc: fix an off-by-one compare on an array size").
For the other one:

Quoted 14 lines
drivers/net/ethernet/sfc/ef10.c +1 -1
index 8bec9383d754..dec0c8083ff3 100644
@@ -5080,7 +5080,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
 
              /* quick bounds check (BCAST result impossible) */
              BUILD_BUG_ON(EFX_EF10_BCAST != 0);
-             if (encap_type > ARRAY_SIZE(map) || map[encap_type] = 0) {
+             if (encap_type >= ARRAY_SIZE(map) || map[encap_type] = 0) {
                      WARN_ON(1);
                      return -EINVAL;
              }

drivers/net/ethernet/sfc/ef10.c static int efx_ef10_filter_insert_def(struct efx_nic *efx, · line 5140

Quoted 8 lines
drivers/net/ethernet/sfc/ef10.c +1 -1
@@ -5134,7 +5134,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
 
              /* quick bounds check (BCAST result impossible) */
              BUILD_BUG_ON(EFX_EF10_BCAST != 0);
-             if (encap_type > ARRAY_SIZE(map) || map[encap_type] = 0) {
+             if (encap_type >= ARRAY_SIZE(map) || map[encap_type] = 0) {
                      WARN_ON(1);
                      return -EINVAL;
              }

The information contained in this message is confidential and is intended for the addressee(s) only. If you have received this message in error, please notify the sender immediately and delete the message. Unless you are an addressee (or authorized to receive for an addressee), you may not use, copy or disclose to anyone this message or any information contained in this message. The unauthorized use, disclosure, copying or alteration of this message is strictly prohibited.

#2 lore raw
Quoted 9 lines · Edward Cree
Quoted 5 lines · Dan Carpenter

These checks are off by one. These are just sanity checks and we don't ever pass invalid values for "encap_type" so it's harmless.

Fixes 9b4108012517 ("sfc: insert catch-all filters for encapsulated traffic")

One of these was already fixed by Colin Ian King in e9904990e8e70a51574e6ec6b872f3c705ec75f0 ("sfc: fix an off-by-one compare on an array size").

Ugh, I missed one of those.

Quoted 32 lines

For the other one:

Quoted 14 lines
drivers/net/ethernet/sfc/ef10.c +1 -1
index 8bec9383d754..dec0c8083ff3 100644
@@ -5080,7 +5080,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
 
              /* quick bounds check (BCAST result impossible) */
              BUILD_BUG_ON(EFX_EF10_BCAST != 0);
-             if (encap_type > ARRAY_SIZE(map) || map[encap_type] = 0) {
+             if (encap_type >= ARRAY_SIZE(map) || map[encap_type] = 0) {
                      WARN_ON(1);
                      return -EINVAL;
              }

drivers/net/ethernet/sfc/ef10.c static int efx_ef10_filter_insert_def(struct efx_nic *efx, · line 5140

Quoted 8 lines
drivers/net/ethernet/sfc/ef10.c +1 -1
@@ -5134,7 +5134,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
 
              /* quick bounds check (BCAST result impossible) */
              BUILD_BUG_ON(EFX_EF10_BCAST != 0);
-             if (encap_type > ARRAY_SIZE(map) || map[encap_type] = 0) {
+             if (encap_type >= ARRAY_SIZE(map) || map[encap_type] = 0) {
                      WARN_ON(1);
                      return -EINVAL;
              }

The information contained in this message is confidential and is intended for the addressee(s) only. If you have received this message in error, please notify the sender immediately and delete the message. Unless you are an addressee (or authorized to receive for an addressee), you may not use, copy or disclose to anyone this message or any information contained in this message. The unauthorized use, disclosure, copying or alteration of this message is strictly prohibited. --
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw

PATCH v2 1/1 sfc: fix an off by one bug

In reply to Edward Cree

This bug is harmless because it's just a sanity check and we always pass valid values for "encap_type" but the test is off by one.

Fixes 9b4108012517 ("sfc: insert catch-all filters for encapsulated traffic")

---
v2: Rebased against last linux-next

drivers/net/ethernet/sfc/ef10.c +1 -1
index 0475f1831b92..dec0c8083ff3 100644
@@ -5134,7 +5134,7 @@ static int efx_ef10_filter_insert_def(struct efx_nic *efx,
 
 		/* quick bounds check (BCAST result impossible) */
 		BUILD_BUG_ON(EFX_EF10_BCAST != 0);
-		if (encap_type > ARRAY_SIZE(map) || map[encap_type] = 0) {
+		if (encap_type >= ARRAY_SIZE(map) || map[encap_type] = 0) {
 			WARN_ON(1);
 			return -EINVAL;
 		}
Acked-by on v2 1/1
#4 lore raw

Re: [patch v2 net-next] sfc: fix an off by one bug

Quoted 5 lines · Dan Carpenter

This bug is harmless because it's just a sanity check and we always pass valid values for "encap_type" but the test is off by one.

Fixes 9b4108012517 ("sfc: insert catch-all filters for encapsulated traffic")

Thanks Dan.

The information contained in this message is confidential and is intended for the addressee(s) only. If you have received this message in error, please notify the sender immediately and delete the message. Unless you are an addressee (or authorized to receive for an addressee), you may not use, copy or disclose to anyone this message or any information contained in this message. The unauthorized use, disclosure, copying or alteration of this message is strictly prohibited.

maintainer Applied
#5 lore raw

Re: [patch v2 net-next] sfc: fix an off by one bug

In reply to Dan Carpenter

From: Dan Carpenter <[email protected]>
Date: Tue, 7 Feb 2017 10:44:31 +0300

Quoted 7 lines

This bug is harmless because it's just a sanity check and we always pass valid values for "encap_type" but the test is off by one.

Fixes 9b4108012517 ("sfc: insert catch-all filters for encapsulated traffic")

---
v2: Rebased against last linux-next

Applied, thanks Dan.