ptp: ocp: Fix board ID over-read
Subsystems (5)
PATCH v3 1/1 ptp: ocp: Fix board ID over-read
The EEPROM board ID is a fixed 13-byte field and is not guaranteed to contain a NUL terminator. Passing it directly to devlink_info_version_fixed_put() treats it as a C string and may read beyond the field.
Format at most OCP_BOARD_ID_LEN bytes into the existing local buffer before reporting the ID. Use a precision limit because the snprintf() output size alone does not bound the source string scan.
---
Changes since RFC v2:
- Split the safety fix from the net-next feature series and target net.
- Use the short Fixes hash.
- Reuse the existing devlink info buffer and bound the source scan with string precision.
- Limit the change to the board ID over-read.
RFC v2:
https://lore.kernel.org/r/[email protected]/
drivers/ptp/ptp_ocp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ptp/ptp_ocp.c +3 -1
@@ -2177,9 +2177,11 @@ ptp_ocp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,if (err)return err; +snprintf (buf,sizeof (buf),"%.*s" ,OCP_BOARD_ID_LEN , + (const char *)bp->board_id); err =devlink_info_version_fixed_put (req,DEVLINK_INFO_VERSION_GENERIC_BOARD_ID , - bp->board_id); + buf);if (err)return err;
Signature · 1 line
2.50.1 (Apple Git-155)
Quoted 33 lines · Ahmad Byagowi
The EEPROM board ID is a fixed 13-byte field and is not guaranteed to contain a NUL terminator. Passing it directly to
devlink_info_version_fixed_put()treats it as a C string and may read beyond the field.Format at most
OCP_BOARD_ID_LENbytes into the existing local buffer before reporting the ID. Use a precision limit because thesnprintf()output size alone does not bound the source string scan.Fixes 0cfcdd1ebcfe ("ptp: ocp: add nvmem interface for accessing eeprom")Signed-off-by Ahmad Byagowi <[email protected]>---
Changes since RFC v2:
- Split the safety fix from the net-next feature series and target net.
- Use the short Fixes hash.
- Reuse the existing devlink info buffer and bound the source scan with string precision.
- Limit the change to the board ID over-read.RFC v2:
https://lore.kernel.org/r/[email protected]/drivers/ptp/ptp_ocp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/ptp/ptp_ocp.c +0
-0@@ -2177,9 +2177,11 @@ ptp_ocp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,if (err)return err;
drivers/ptp/ptp_ocp.c ptp_ocp_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req, · line 2187
Quoted 10 lines
drivers/ptp/ptp_ocp.c +3
-1+snprintf (buf,sizeof (buf),"%.*s" ,OCP_BOARD_ID_LEN , + (const char *)bp->board_id); err =devlink_info_version_fixed_put (req,DEVLINK_INFO_VERSION_GENERIC_BOARD_ID , - bp->board_id); + buf);if (err)return err;
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Tue, 4 Aug 2026 14:07:51 -0700 you wrote:
The EEPROM board ID is a fixed 13-byte field and is not guaranteed to contain a NUL terminator. Passing it directly to
devlink_info_version_fixed_put()treats it as a C string and may read beyond the field.Format at most
OCP_BOARD_ID_LENbytes into the existing local buffer before reporting the ID. Use a precision limit because thesnprintf()output size alone does not bound the source string scan.[...]
Here is the summary with links:
- [net,v3] ptp: ocp: Fix board ID over-read
https://git.kernel.org/netdev/net/c/6b69f2ef10cd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html