From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A09B3A3822 for ; Sat, 8 Aug 2026 19:10:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786216225; cv=none; b=auxrsNrZQMkv7mWjwVu6WunGVfYAlwOYexb6iHwtO/3j5+IR19mQnafM2aVKNYyElysnIOxjQX82Lu79mBNZJxNrWyylCO0MRlMCLf0UZwdaqdknQFiuH3LRDOL4BBBJ4el2FAe6JZV+3cwFgZCKiL8sVyA+SHxK9IPnS0rd3m4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786216225; c=relaxed/simple; bh=S4mpYqMd0/Ct8+6tq7W2kh+rr/6yuokdVT2g6hiCips=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=TSGrGWTymsuzy6RTdEve+Y7Qphj77WWFjXATUTiGPJytGGkHALyN7pjDuoOQmQF5Yx9MWpitBU6IlkXOSt1aYQnVubyLoQQkMYZJaVCgONhzx/UfP3VKCuXWoodsDSIgkG0jTYB3Xak0W7V6tScNh5whtaxt/4LjN5My8961bkk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cmUDyGLm; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cmUDyGLm" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2cca0c5799eso5697615ad.0 for ; Sat, 08 Aug 2026 12:10:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786216223; x=1786821023; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=y4wD+x2lcQbQxh5BgV6YYsoRTfpHiShzTcIKLPwOniI=; b=cmUDyGLmg/dHkWn4l0LtoZ16S5mt8bv0axPQqMehxeOTlKiHT2nLk8YPPZccRZ6q03 PMlMnElunlKlEbyAiyab9rb8fqT75iRgmFmgGmHHrWQhK+onGuKypcnfS5LeCcGVf3Nj bBNNHuebM7JrBLsdr57eD4IG30/U6w+K6IC9ywHzAq6Hdl1A2/Oxv0o+jB+7FRFgwEZT mtQZg1ToHaW+XiLpBrDXDMm8aNrbxQHqa3Q8SyQsSgbQ1gwy0E6FIU6sTe2ALhS4ya+X nixHV5OUiBvzlLd86XxcxeB+rA23UPnadFuvLCup5Rov165QEr3vjPA7SfHqptjRCNW9 I5gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786216223; x=1786821023; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=y4wD+x2lcQbQxh5BgV6YYsoRTfpHiShzTcIKLPwOniI=; b=dMauEGqmKhC6vtABisJyZAyNZTPR/PHzMdZ+oV8Ju8iXQPxknDtOENDogb7XtNwA7d dKLKAA/BAz4lOjlXqTTKQCkSNOi/MTdurnZoxkVhLKb9jNnELbv+2wqXu9/p840DtJ3H WVaYeUuHvD2piGjeX5ZmjmGzfu3upQJv87HYIV5sk0LNoBC3flRHXCGOJ5+6x5PEvyeN AOaXKCMFqlgxQGxD2rroMVlF7zmboigp12lznwa5W7bv+/Vre3Rg9TUuBzRg8JNUzLtl uoX9fR/66wQtAqw5JNbA49QagHIPPJd9f4jrdNgpppoL8VEjw4Cr96nMQy25iSx0i35h sB7Q== X-Forwarded-Encrypted: i=1; AHgh+Rq/wpT4RkI3yWUZCnNo1p46DSTeD6HEsf9GcwZL95IqF7sC2H9kTmhQWq3PaCreZZHlKFIfxM/sdnCyek4=@vger.kernel.org X-Gm-Message-State: AOJu0YxFvrEZtVv6xnRlFJJYehu9h0XOhmAKttZAiRqLSQqF6VqnJSDq BNpYHobRkqhymXas1uf/gGBo4ua0FSeS4JqVm/1EJ72XyFL3rb9JNo+P X-Gm-Gg: AR+sD12fZ89XX1dVK93t0ZpWbXR9R3I5+p1hZxZayiKeR5yorgWVqMiZE+93WXZMn3I kMYCytKlsY7hH4YAtRahnkqHVc6iyprWmiAQsrhZlwGFtfNS4OS6Tokhxy7XeDBtQgdhb5/Zh2g uXEw2voYaNz6eomVt2PRHTEtNclpPie8/jeA45DZdg/cUoeO2KZLsMkjSQ7ir0kr5m5Pm9iSCLo 1MCE7JiaVbd0Bn8kd1/lrHHytHFfqaLAes5g+tEy2U1aq6eW7nWe0XN0F2JviVN5Ha5OfhkbVjI rJLC813zj9S0RMrc66t+vqlRARgJvRcsRhcIa+utEccLCpexVNxw6BYcYa8AzmX+IFgFyltxNe2 HlVe19Zfi2MdignioAx3Yr2hKtLNBbDYNLP4PUfXR6ydG/P4lk9pK4rep6BJRGZNX9pEqAdtf9W 0lfHB+yNSc3cqpv7nNQcPDW3XCAT9C+weex79I6M+9MN6JujZd02zcbbP2TSpfffEK X-Received: by 2002:a05:6a21:6816:b0:3bf:6237:4d49 with SMTP id adf61e73a8af0-3cbce8d8e50mr10397119637.23.1786216223277; Sat, 08 Aug 2026 12:10:23 -0700 (PDT) Received: from user ([2405:201:c052:b00b:e5fc:7669:b85:3eb7]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1410199cf49sm18817125c88.3.2026.08.08.12.10.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Aug 2026 12:10:22 -0700 (PDT) Date: Sun, 9 Aug 2026 00:39:21 +0530 From: Yalagada Pavan Kumar To: Kohei Enju Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, linux-kernel@vger.kernel.org, skhan@linuxfoundation.org, syzbot+e0abb1d45ac291ebebeb@syzkaller.appspotmail.com Subject: Re: [Intel-wired-lan] [PATCH] e100: prevent shift out-of-bounds in e100_eeprom_load Message-ID: References: <20260807145626.52692-1-pavankumaryalagada@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Sun, Aug 09, 2026 at 12:12:31AM +0900, Kohei Enju wrote: > On 08/07 20:26, pavankumaryalagada@gmail.com wrote: > > From: Yalagada Pavan Kumar > > > > When reading the EEPROM address length, e100_eeprom_read() can return > > an invalid length (0 or >= 16). Passing an invalid addr_len to bit-shift > > operations causes a shift out-of-bounds, triggering a kernel panic or > > UBSAN warning. > > > > Validate addr_len after reading it from EEPROM and return -EINVAL if > > the value is out of bounds. Additionally, use 1U to prevent > > signed integer overflow when calculating eeprom_wc. > > > > Reported-by: syzbot+e0abb1d45ac291ebebeb@syzkaller.appspotmail.com > > Tested-by: syzbot+e0abb1d45ac291ebebeb@syzkaller.appspotmail.com > > Closes: https://syzkaller.appspot.com/bug?extid=e0abb1d45ac291ebebeb > > Signed-off-by: Yalagada Pavan Kumar > > --- > > Tested using syzbot c reproducer. > > --- > > drivers/net/ethernet/intel/e100.c | 17 +++++++++++++++-- > > 1 file changed, 15 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c > > index 29960762e64a..1de5cd41ea0c 100644 > > --- a/drivers/net/ethernet/intel/e100.c > > +++ b/drivers/net/ethernet/intel/e100.c > > @@ -744,7 +744,12 @@ static __le16 e100_eeprom_read(struct nic *nic, u16 *addr_len, u16 addr) > > * complete address. Use this to adjust addr_len. */ > > ctrl = ioread8(&nic->csr->eeprom_ctrl_lo); > > if (!(ctrl & eedo) && i > 16) { > > - *addr_len -= (i - 16); > > + u16 len = i - 16; > > + > > + if (len > *addr_len) > > + *addr_len = 0; > > + else > > + *addr_len -= len; > > i = 17; > > } > > > > @@ -765,7 +770,15 @@ static int e100_eeprom_load(struct nic *nic) > > > > /* Try reading with an 8-bit addr len to discover actual addr len */ > > e100_eeprom_read(nic, &addr_len, 0); > > - nic->eeprom_wc = 1 << addr_len; > > + > > + if (!addr_len || addr_len >= 16) { > > + netif_err(nic, probe, nic->netdev, > > + "Invalid EEPROM address length %u\n", > > + addr_len); > > + return -EINVAL; > > An invalid address length here appears to indicate an unexpected > response from the EEPROM, rather than an invalid argument. Therefore, > -EINVAL seems somewhat misleading. Would -EIO be more appropriate here? Agreed, addr_len comes from an unexpected EEPROM response, so i will change -EINVAL to -EIO. > > Also, e100_eeprom_save() seems to have the same pattern. Shouldn't we > fix that as well? yes, i'll fix e100_eeprom_save() as well. > > > + } > > + > > + nic->eeprom_wc = 1U << addr_len; > > The commit message says that the U suffix prevents signed integer > overflow. However, after the validation addr_len is in [1, 15], so 1 << > addr_len cannot overflow an int. I think what prevents the out-of-bounds > shift is the validation, not the U. Agreed, I'll remove the unnecessary U suffix. I made these changes and will send v2. > > > > > for (addr = 0; addr < nic->eeprom_wc; addr++) { > > nic->eeprom[addr] = e100_eeprom_read(nic, &addr_len, addr); > > -- > > 2.43.0 > >