Skip to contentSkip to conversation

tun: Fix unicast filter overflow

PATCH In review Alex Williamson 2 participants 4 messages Feb 7, 2009 – Feb 9, 2009

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

PATCH 1/1 tun: Fix unicast filter overflow

Tap devices can make use of a small MAC filter set via the TUNSETTXFILTER ioctl. The filter has a set of exact matches plus a hash for imperfect filtering of additional multicast addresses. The current code is unbalanced, adding unicast addresses to the multicast hash, but only checking the hash against multicast addresses. This results in the filter dropping unicast addresses that overflow the exact filter. The fix is simply to disable the filter by leaving count set to zero if we find non-multicast addresses after the exact match table is filled.

---

Proposed for 2.6.29 and stable.

 drivers/net/tun.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
drivers/net/tun.c +8 -2
index d7b81e4..09fea31 100644
@@ -157,10 +157,16 @@ static int update_filter(struct tap_filter *filter, void __user *arg)
 
 	nexact = n;
 
-	/* The rest is hashed */
+	/* Remaining multicast addresses are hashed,
+	 * unicast will leave the filter disabled. */
 	memset(filter->mask, 0, sizeof(filter->mask));
-	for (; n < uf.count; n++)
+	for (; n < uf.count; n++) {
+		if (!is_multicast_ether_addr(addr[n].u)) {
+			err = 0; /* no filter */
+			goto done;
+		}
 		addr_hash_set(filter->mask, addr[n].u);
+	}
 
 	/* For ALLMULTI just set the mask to all ones.
 	 * This overrides the mask populated above. */
maintainer
#1 lore raw

From: Alex Williamson <[email protected]>
Date: Sat, 07 Feb 2009 10:45:13 -0700

Quoted 11 lines

Tap devices can make use of a small MAC filter set via the TUNSETTXFILTER ioctl. The filter has a set of exact matches plus a hash for imperfect filtering of additional multicast addresses. The current code is unbalanced, adding unicast addresses to the multicast hash, but only checking the hash against multicast addresses. This results in the filter dropping unicast addresses that overflow the exact filter. The fix is simply to disable the filter by leaving count set to zero if we find non-multicast addresses after the exact match table is filled.

Quoted 1 line

Doesn't it make more sense to remove the multicast check in the filter check function?

With your change, the user gets absolutely no indication that filtering has been completely disabled simply because they put too many unicast addresses into the filter. We just return zero, that's crazy.

#2 lore raw
Quoted 16 lines · David Miller

From: Alex Williamson <[email protected]>
Date: Sat, 07 Feb 2009 10:45:13 -0700

Quoted 11 lines

Tap devices can make use of a small MAC filter set via the TUNSETTXFILTER ioctl. The filter has a set of exact matches plus a hash for imperfect filtering of additional multicast addresses. The current code is unbalanced, adding unicast addresses to the multicast hash, but only checking the hash against multicast addresses. This results in the filter dropping unicast addresses that overflow the exact filter. The fix is simply to disable the filter by leaving count set to zero if we find non-multicast addresses after the exact match table is filled.

Quoted 1 line
Quoted 7 lines

Doesn't it make more sense to remove the multicast check in the filter check function?

With your change, the user gets absolutely no indication that filtering has been completely disabled simply because they put too many unicast addresses into the filter. We just return zero, that's crazy.

Sure, that's another option, but we'd then need to figure out what to do with TUN_FLT_ALLMULTI. Unicast would almost needs it's own hash list if we want to support an allmulti mode that's less than promiscuous. The return value of the ioctl is the number of exact filters, so the user will know what happened. Thanks,

Alex

maintainer
#3 lore raw

From: Alex Williamson <[email protected]>
Date: Sun, 08 Feb 2009 18:43:57 -0700

Quoted 5 lines

Sure, that's another option, but we'd then need to figure out what to do with TUN_FLT_ALLMULTI. Unicast would almost needs it's own hash list if we want to support an allmulti mode that's less than promiscuous. The return value of the ioctl is the number of exact filters, so the user will know what happened.

Oh so that's what the return value means.

Ok, I guess for now your patch is fine, I'll apply it and queue it up for -stable, thanks!