On Tue, 7 Aug 2001, Alan Cox wrote:
> o Fix bug in atm_do_connect_dev (bogus EINVALs) (Germán González)
--- linux.vanilla/net/atm/common.c Wed Jul 4 12:21:53 2001
+++ linux.ac/net/atm/common.c Wed Jul 25 16:28:24 2001
@@ -210,7 +210,7 @@
if ((vpi != ATM_VPI_UNSPEC && vpi != ATM_VPI_ANY &&
vpi >> dev->ci_range.vpi_bits) || (vci != ATM_VCI_UNSPEC &&
- vci != ATM_VCI_ANY && vci >> dev->ci_range.vci_bits))
+ vci != ATM_VCI_ANY && vci > dev->ci_range.vci_bits))
return -EINVAL;
if (vci > 0 && vci < ATM_NOT_RSV_VCI &&
!capable(CAP_NET_BIND_SERVICE))
return -EPERM;
The patch is not correct, this test compares number of allowed bits
to an integer. And due to this, breaks most of ATM. Even signalling
daemons cannot connect.
But yes, the original seems broken, too. I included code bits doing this
check elsewhere in ATM implementation code. I think the correct patch
would be
- vci != ATM_VCI_ANY && vci >> dev->ci_range.vci_bits))
+ vci != ATM_VCI_ANY && vci > 1 << dev->ci_range.vci_bits))
Code bits taken from elsewhere:
net/atm/atm/atm_misc.c:
if (c >= 1 << vcc->dev->ci_range.vci_bits)
drivers/atm/eni.c:
dev->ci_range.vci_bits = NR_VCI_LD;
drivers/atm/midway.h:
#define NR_VCI_LD 10 /* log2(NR_VCI) */
Thanks,
Sampsa Ranta
sampsa@netsonic.fi
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Aug 15 2001 - 21:00:28 EST