From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 931E02FA627; Tue, 17 Jun 2025 16:56:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750179391; cv=none; b=twKjLTGfSbtL/nVo9DTFL3Nzb5JWIjmgsHER+v46Sauo+k5ly5ahQDvcBGLapb1vzQICnWywLHNJLacoR3Bp5EUDXeaLqaex0YMNJTLDlqiVBduQi6fgUVjub+f31HMriHpr2X1mcd2+bkFMXUjhFm4r9nBjqBlQfW8qiuoTQGk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750179391; c=relaxed/simple; bh=RTdXL7wJFwDNoPDHY5uNE8AkCSHQDb0BN7NhmhxL/Vs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kIlAEsexTquEdzszUimaNoVJFd10+ujYSEkoGKn/b6R8VwENc8+loqroMl8Q6F3b7ZLk8V4V6fUMbrnv8krNwWu4Jz41M/Z7rneaV18LOflnEgEyVUeAncT3rzKBO9CLtn5bL1NGUWlStBgl5bsE9NurY4GTyFTS6JTaJUX3tcs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yedkCWqz; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yedkCWqz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 260FEC4CEE3; Tue, 17 Jun 2025 16:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750179391; bh=RTdXL7wJFwDNoPDHY5uNE8AkCSHQDb0BN7NhmhxL/Vs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yedkCWqzWEwRuDtVyo6g8plPYDYi9ZSfv66ET03lKA6XjMuxbK6AmowGXG5ByFQKv Z7JzUeMvhdjR6eTrv5KK8Mim6I+e7qu0jk8DOAWViQv9f4tus5BLyHDq3kW1wDoplI 0cjVwe5q9G5p9YE5iGN9URFXYDyKVYNEQtfflinY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jakub Raczynski , Wenjing Shan , "David S. Miller" , Sasha Levin Subject: [PATCH 6.15 704/780] net/mdiobus: Fix potential out-of-bounds clause 45 read/write access Date: Tue, 17 Jun 2025 17:26:52 +0200 Message-ID: <20250617152520.165258903@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152451.485330293@linuxfoundation.org> References: <20250617152451.485330293@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Raczynski [ Upstream commit 260388f79e94fb3026c419a208ece8358bb7b555 ] When using publicly available tools like 'mdio-tools' to read/write data from/to network interface and its PHY via C45 (clause 45) mdiobus, there is no verification of parameters passed to the ioctl and it accepts any mdio address. Currently there is support for 32 addresses in kernel via PHY_MAX_ADDR define, but it is possible to pass higher value than that via ioctl. While read/write operation should generally fail in this case, mdiobus provides stats array, where wrong address may allow out-of-bounds read/write. Fix that by adding address verification before C45 read/write operation. While this excludes this access from any statistics, it improves security of read/write operation. Fixes: 4e4aafcddbbf ("net: mdio: Add dedicated C45 API to MDIO bus drivers") Signed-off-by: Jakub Raczynski Reported-by: Wenjing Shan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/phy/mdio_bus.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index adb17ec937151..909b4d53fdacd 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -999,6 +999,9 @@ int __mdiobus_c45_read(struct mii_bus *bus, int addr, int devad, u32 regnum) lockdep_assert_held_once(&bus->mdio_lock); + if (addr >= PHY_MAX_ADDR) + return -ENXIO; + if (bus->read_c45) retval = bus->read_c45(bus, addr, devad, regnum); else @@ -1030,6 +1033,9 @@ int __mdiobus_c45_write(struct mii_bus *bus, int addr, int devad, u32 regnum, lockdep_assert_held_once(&bus->mdio_lock); + if (addr >= PHY_MAX_ADDR) + return -ENXIO; + if (bus->write_c45) err = bus->write_c45(bus, addr, devad, regnum, val); else -- 2.39.5