> -----Original Message----- > From: netdev-ow...@vger.kernel.org [mailto:netdev-ow...@vger.kernel.org] > On Behalf Of Andi Kleen > Sent: Monday, September 30, 2013 1:29 PM > To: linux-kernel@vger.kernel.org > Cc: Andi Kleen; Kirsher, Jeffrey T; net...@vger.kernel.org > Subject: [PATCH 07/11] igb: Avoid uninitialized advertised variable in > eee_set_cur > > From: Andi Kleen <a...@linux.intel.com> > > eee_get_cur assumes that the output data is already zeroed. It can > read-modify- > write the advertised field: > > if (ipcnfg & E1000_IPCNFG_EEE_100M_AN) > 2594 edata->advertised |= ADVERTISED_100baseT_Full; > > This is ok for the normal ethtool eee_get call, which always zeroes the input > data before. > > But eee_set_cur also calls eee_get_cur and it did not zero the input field. > Later > on it then compares agsinst the field, which can contain partial stack > garbage. > > Zero the input field in eee_set_cur() too. > > Cc: jeffrey.t.kirs...@intel.com > Cc: net...@vger.kernel.org > Signed-off-by: Andi Kleen <a...@linux.intel.com> > --- > drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c > b/drivers/net/ethernet/intel/igb/igb_ethtool.c > index 48cbc83..41e37ff 100644 > --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c > +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c > @@ -2652,6 +2652,8 @@ static int igb_set_eee(struct net_device *netdev, > (hw->phy.media_type != e1000_media_type_copper)) > return -EOPNOTSUPP; > > + memset(&eee_curr, 0, sizeof(struct ethtool_eee)); > + > ret_val = igb_get_eee(netdev, &eee_curr); > if (ret_val) > return ret_val; > -- > 1.8.3.1 >
ACK Thanks, Carolyn -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
