[<prev] [next>] [day] [month] [year] [list]
Message-ID: <82e4877d0806260730w5fb2640bwa38547153ab42ee4@mail.gmail.com>
Date: Thu, 26 Jun 2008 10:30:22 -0400
From: "Parag Warudkar" <parag.warudkar@...il.com>
To: Jie.Yang@...eros.com
Cc: "Linux Kernel Mailing List" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 2.6.25.3 5/5] atl1e: Atheros L1E Gigabit Ethernet driver
Jie Yang <Jie.Yang <at> Atheros.com> writes:
> +static int atl1e_get_eeprom_len(struct net_device *netdev)
> +{
> + struct atl1e_adapter *adapter = netdev_priv(netdev);
> +
> + if (!check_eeprom_exist(&adapter->hw))
> + return 512;
Please #define ATL1E_EEPROM_LEN 512 - it is used below too.
> + else
> + return 0;
> +}
> +
> +static int atl1e_get_eeprom(struct net_device *netdev,
> + struct ethtool_eeprom *eeprom, u8 *bytes)
> +{
> + struct atl1e_adapter *adapter = netdev_priv(netdev);
> + struct atl1e_hw *hw = &adapter->hw;
> + u32 *eeprom_buff;
> + int first_dword, last_dword;
> + int ret_val = 0;
> + int i;
> +
> + if (eeprom->len == 0)
> + return -EINVAL;
> +
> + if (check_eeprom_exist(hw))
> + return -EINVAL;
> +
> + eeprom->magic = hw->vendor_id | (hw->device_id << 16);
> +
> + first_dword = eeprom->offset >> 2;
> + last_dword = (eeprom->offset + eeprom->len - 1) >> 2;
> +
> + eeprom_buff = kmalloc(sizeof(u32) *
> + (last_dword - first_dword + 1), GFP_KERNEL);
> + if (eeprom_buff == NULL)
> + return -ENOMEM;
> +
> + for (i = first_dword; i < last_dword; i++) {
> + if (!read_eeprom(hw, i * 4, &(eeprom_buff[i-first_dword])))
> + return -EIO;
eeprom_buff is leaked here if read_eeprom fails.
> + }
> +
> + memcpy(bytes, (u8 *)eeprom_buff + (eeprom->offset & 3),
> + eeprom->len);
> + kfree(eeprom_buff);
> +
> + return ret_val;
> +}
> +
> +static int atl1e_set_eeprom(struct net_device *netdev,
> + struct ethtool_eeprom *eeprom, u8 *bytes)
> +{
> + struct atl1e_adapter *adapter = netdev_priv(netdev);
> + struct atl1e_hw *hw = &adapter->hw;
> + u32 *eeprom_buff;
> + u32 *ptr;
> + int max_len, first_dword, last_dword, ret_val = 0;
> + int i;
> +
> + if (eeprom->len == 0)
> + return -EOPNOTSUPP;
> +
> + if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
> + return -EFAULT;
This should probably be -EINVAL?
> +
> + max_len = 512;
Better to replace with a #define as mentioned above.
> +
> + first_dword = eeprom->offset >> 2;
> + last_dword = (eeprom->offset + eeprom->len - 1) >> 2;
> + eeprom_buff = kmalloc(max_len, GFP_KERNEL);
> + if (!eeprom_buff)
> + return -ENOMEM;
> +
> + ptr = (u32 *)eeprom_buff;
> +
> + if (eeprom->offset & 3) {
> + /* need read/modify/write of first changed EEPROM word */
> + /* only the second byte of the word is being modified */
> + if (!read_eeprom(hw, first_dword * 4, &(eeprom_buff[0])))
> + return -EIO;
eeprom_buff is leaked again if read_eeprom() fails.
> + ptr++;
> + }
> + if (((eeprom->offset + eeprom->len) & 3)) {
> + /* need read/modify/write of last changed EEPROM word */
> + /* only the first byte of the word is being modified */
> +
> + if (!read_eeprom(hw, last_dword * 4,
> + &(eeprom_buff[last_dword - first_dword])))
> + return -EIO;
eeprom_buff is leaked again if read_eeprom() fails.
> + }
> +
> + /* Device's eeprom is always little-endian, word addressable */
> + memcpy(ptr, bytes, eeprom->len);
> +
> + for (i = 0; i < last_dword - first_dword + 1; i++) {
> + if (!write_eeprom(hw, ((first_dword + i) * 4), eeprom_buff[i]))
> + return -EIO;
eeprom_buff is leaked again if read_eeprom() fails.
> + }
> +
> + kfree(eeprom_buff);
> + return ret_val;
> +}
> +
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists