Skip to content

Commit bc42ef3

Browse files
committed
ibmvnic: Use kernel helpers for hex dumps
jira LE-3428 cve CVE-2025-22104 Rebuild_History Non-Buildable kernel-5.14.0-570.23.1.el9_6 commit-author Nick Child <nnac123@linux.ibm.com> commit d93a6ca Previously, when the driver was printing hex dumps, the buffer was cast to an 8 byte long and printed using string formatters. If the buffer size was not a multiple of 8 then a read buffer overflow was possible. Therefore, create a new ibmvnic function that loops over a buffer and calls hex_dump_to_buffer instead. This patch address KASAN reports like the one below: ibmvnic 30000003 env3: Login Buffer: ibmvnic 30000003 env3: 01000000af000000 <...> ibmvnic 30000003 env3: 2e6d62692e736261 ibmvnic 30000003 env3: 65050003006d6f63 ================================================================== BUG: KASAN: slab-out-of-bounds in ibmvnic_login+0xacc/0xffc [ibmvnic] Read of size 8 at addr c0000001331a9aa8 by task ip/17681 <...> Allocated by task 17681: <...> ibmvnic_login+0x2f0/0xffc [ibmvnic] ibmvnic_open+0x148/0x308 [ibmvnic] __dev_open+0x1ac/0x304 <...> The buggy address is located 168 bytes inside of allocated 175-byte region [c0000001331a9a00, c0000001331a9aaf) <...> ================================================================= ibmvnic 30000003 env3: 000000000033766e Fixes: 032c5e8 ("Driver for IBM System i/p VNIC protocol") Signed-off-by: Nick Child <nnac123@linux.ibm.com> Reviewed-by: Dave Marquardt <davemarq@linux.ibm.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20250320212951.11142-1-nnac123@linux.ibm.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit d93a6ca) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 0848fd6 commit bc42ef3

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4682,6 +4682,18 @@ static void vnic_add_client_data(struct ibmvnic_adapter *adapter,
46824682
strscpy(vlcd->name, adapter->netdev->name, len);
46834683
}
46844684

4685+
static void ibmvnic_print_hex_dump(struct net_device *dev, void *buf,
4686+
size_t len)
4687+
{
4688+
unsigned char hex_str[16 * 3];
4689+
4690+
for (size_t i = 0; i < len; i += 16) {
4691+
hex_dump_to_buffer((unsigned char *)buf + i, len - i, 16, 8,
4692+
hex_str, sizeof(hex_str), false);
4693+
netdev_dbg(dev, "%s\n", hex_str);
4694+
}
4695+
}
4696+
46854697
static int send_login(struct ibmvnic_adapter *adapter)
46864698
{
46874699
struct ibmvnic_login_rsp_buffer *login_rsp_buffer;
@@ -4792,10 +4804,8 @@ static int send_login(struct ibmvnic_adapter *adapter)
47924804
vnic_add_client_data(adapter, vlcd);
47934805

47944806
netdev_dbg(adapter->netdev, "Login Buffer:\n");
4795-
for (i = 0; i < (adapter->login_buf_sz - 1) / 8 + 1; i++) {
4796-
netdev_dbg(adapter->netdev, "%016lx\n",
4797-
((unsigned long *)(adapter->login_buf))[i]);
4798-
}
4807+
ibmvnic_print_hex_dump(adapter->netdev, adapter->login_buf,
4808+
adapter->login_buf_sz);
47994809

48004810
memset(&crq, 0, sizeof(crq));
48014811
crq.login.first = IBMVNIC_CRQ_CMD;
@@ -5171,15 +5181,13 @@ static void handle_query_ip_offload_rsp(struct ibmvnic_adapter *adapter)
51715181
{
51725182
struct device *dev = &adapter->vdev->dev;
51735183
struct ibmvnic_query_ip_offload_buffer *buf = &adapter->ip_offload_buf;
5174-
int i;
51755184

51765185
dma_unmap_single(dev, adapter->ip_offload_tok,
51775186
sizeof(adapter->ip_offload_buf), DMA_FROM_DEVICE);
51785187

51795188
netdev_dbg(adapter->netdev, "Query IP Offload Buffer:\n");
5180-
for (i = 0; i < (sizeof(adapter->ip_offload_buf) - 1) / 8 + 1; i++)
5181-
netdev_dbg(adapter->netdev, "%016lx\n",
5182-
((unsigned long *)(buf))[i]);
5189+
ibmvnic_print_hex_dump(adapter->netdev, buf,
5190+
sizeof(adapter->ip_offload_buf));
51835191

51845192
netdev_dbg(adapter->netdev, "ipv4_chksum = %d\n", buf->ipv4_chksum);
51855193
netdev_dbg(adapter->netdev, "ipv6_chksum = %d\n", buf->ipv6_chksum);
@@ -5410,10 +5418,8 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq,
54105418
netdev->mtu = adapter->req_mtu - ETH_HLEN;
54115419

54125420
netdev_dbg(adapter->netdev, "Login Response Buffer:\n");
5413-
for (i = 0; i < (adapter->login_rsp_buf_sz - 1) / 8 + 1; i++) {
5414-
netdev_dbg(adapter->netdev, "%016lx\n",
5415-
((unsigned long *)(adapter->login_rsp_buf))[i]);
5416-
}
5421+
ibmvnic_print_hex_dump(netdev, adapter->login_rsp_buf,
5422+
adapter->login_rsp_buf_sz);
54175423

54185424
/* Sanity checks */
54195425
if (login->num_txcomp_subcrqs != login_rsp->num_txsubm_subcrqs ||

0 commit comments

Comments
 (0)