diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2013-08-27 04:16:22 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-08-29 01:24:08 -0400 |
| commit | 80b17be70b63646cb141bf1826afe32281e561ec (patch) | |
| tree | c82c0382e811d69142caf8bcd0133a443df189f6 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |
| parent | Merge branch 'xen-netback' (diff) | |
| download | linux-dev-80b17be70b63646cb141bf1826afe32281e561ec.tar.xz linux-dev-80b17be70b63646cb141bf1826afe32281e561ec.zip | |
qlcnic: underflow in qlcnic_validate_max_tx_rings()
This function checks the upper bound but it doesn't check for negative
numbers:
if (txq > QLCNIC_MAX_TX_RINGS) {
I've solved this by making "txq" a u32 type. I chose that because
->tx_count in the ethtool_channels struct is a __u32.
This bug was added in aa4a1f7df7 ('qlcnic: Enable Tx queue changes using
ethtool for 82xx Series adapter.').
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index df96f66dbb10..7dde3ba6d9a4 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -3548,7 +3548,7 @@ qlcnicvf_start_firmware(struct qlcnic_adapter *adapter) return err; } -int qlcnic_validate_max_tx_rings(struct qlcnic_adapter *adapter, int txq) +int qlcnic_validate_max_tx_rings(struct qlcnic_adapter *adapter, u32 txq) { struct net_device *netdev = adapter->netdev; u8 max_hw = QLCNIC_MAX_TX_RINGS; |