Skip to content

Commit 19efa17

Browse files
Nick Childgregkh
authored andcommitted
ibmvnic: Use kernel helpers for hex dumps
[ Upstream 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 469bd67 commit 19efa17

1 file changed

Lines changed: 18 additions & 12 deletions

File tree

drivers/net/ethernet/ibm/ibmvnic.c

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

4663+
static void ibmvnic_print_hex_dump(struct net_device *dev, void *buf,
4664+
size_t len)
4665+
{
4666+
unsigned char hex_str[16 * 3];
4667+
4668+
for (size_t i = 0; i < len; i += 16) {
4669+
hex_dump_to_buffer((unsigned char *)buf + i, len - i, 16, 8,
4670+
hex_str, sizeof(hex_str), false);
4671+
netdev_dbg(dev, "%s\n", hex_str);
4672+
}
4673+
}
4674+
46634675
static int send_login(struct ibmvnic_adapter *adapter)
46644676
{
46654677
struct ibmvnic_login_rsp_buffer *login_rsp_buffer;
@@ -4770,10 +4782,8 @@ static int send_login(struct ibmvnic_adapter *adapter)
47704782
vnic_add_client_data(adapter, vlcd);
47714783

47724784
netdev_dbg(adapter->netdev, "Login Buffer:\n");
4773-
for (i = 0; i < (adapter->login_buf_sz - 1) / 8 + 1; i++) {
4774-
netdev_dbg(adapter->netdev, "%016lx\n",
4775-
((unsigned long *)(adapter->login_buf))[i]);
4776-
}
4785+
ibmvnic_print_hex_dump(adapter->netdev, adapter->login_buf,
4786+
adapter->login_buf_sz);
47774787

47784788
memset(&crq, 0, sizeof(crq));
47794789
crq.login.first = IBMVNIC_CRQ_CMD;
@@ -5149,15 +5159,13 @@ static void handle_query_ip_offload_rsp(struct ibmvnic_adapter *adapter)
51495159
{
51505160
struct device *dev = &adapter->vdev->dev;
51515161
struct ibmvnic_query_ip_offload_buffer *buf = &adapter->ip_offload_buf;
5152-
int i;
51535162

51545163
dma_unmap_single(dev, adapter->ip_offload_tok,
51555164
sizeof(adapter->ip_offload_buf), DMA_FROM_DEVICE);
51565165

51575166
netdev_dbg(adapter->netdev, "Query IP Offload Buffer:\n");
5158-
for (i = 0; i < (sizeof(adapter->ip_offload_buf) - 1) / 8 + 1; i++)
5159-
netdev_dbg(adapter->netdev, "%016lx\n",
5160-
((unsigned long *)(buf))[i]);
5167+
ibmvnic_print_hex_dump(adapter->netdev, buf,
5168+
sizeof(adapter->ip_offload_buf));
51615169

51625170
netdev_dbg(adapter->netdev, "ipv4_chksum = %d\n", buf->ipv4_chksum);
51635171
netdev_dbg(adapter->netdev, "ipv6_chksum = %d\n", buf->ipv6_chksum);
@@ -5388,10 +5396,8 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq,
53885396
netdev->mtu = adapter->req_mtu - ETH_HLEN;
53895397

53905398
netdev_dbg(adapter->netdev, "Login Response Buffer:\n");
5391-
for (i = 0; i < (adapter->login_rsp_buf_sz - 1) / 8 + 1; i++) {
5392-
netdev_dbg(adapter->netdev, "%016lx\n",
5393-
((unsigned long *)(adapter->login_rsp_buf))[i]);
5394-
}
5399+
ibmvnic_print_hex_dump(netdev, adapter->login_rsp_buf,
5400+
adapter->login_rsp_buf_sz);
53955401

53965402
/* Sanity checks */
53975403
if (login->num_txcomp_subcrqs != login_rsp->num_txsubm_subcrqs ||

0 commit comments

Comments
 (0)