Skip to content

Commit d93a6ca

Browse files
Nick Childkuba-moo
authored andcommitted
ibmvnic: Use kernel helpers for hex dumps
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 <[email protected]> Reviewed-by: Dave Marquardt <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 094ee60 commit d93a6ca

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
@@ -4829,6 +4829,18 @@ static void vnic_add_client_data(struct ibmvnic_adapter *adapter,
48294829
strscpy(vlcd->name, adapter->netdev->name, len);
48304830
}
48314831

4832+
static void ibmvnic_print_hex_dump(struct net_device *dev, void *buf,
4833+
size_t len)
4834+
{
4835+
unsigned char hex_str[16 * 3];
4836+
4837+
for (size_t i = 0; i < len; i += 16) {
4838+
hex_dump_to_buffer((unsigned char *)buf + i, len - i, 16, 8,
4839+
hex_str, sizeof(hex_str), false);
4840+
netdev_dbg(dev, "%s\n", hex_str);
4841+
}
4842+
}
4843+
48324844
static int send_login(struct ibmvnic_adapter *adapter)
48334845
{
48344846
struct ibmvnic_login_rsp_buffer *login_rsp_buffer;
@@ -4939,10 +4951,8 @@ static int send_login(struct ibmvnic_adapter *adapter)
49394951
vnic_add_client_data(adapter, vlcd);
49404952

49414953
netdev_dbg(adapter->netdev, "Login Buffer:\n");
4942-
for (i = 0; i < (adapter->login_buf_sz - 1) / 8 + 1; i++) {
4943-
netdev_dbg(adapter->netdev, "%016lx\n",
4944-
((unsigned long *)(adapter->login_buf))[i]);
4945-
}
4954+
ibmvnic_print_hex_dump(adapter->netdev, adapter->login_buf,
4955+
adapter->login_buf_sz);
49464956

49474957
memset(&crq, 0, sizeof(crq));
49484958
crq.login.first = IBMVNIC_CRQ_CMD;
@@ -5319,15 +5329,13 @@ static void handle_query_ip_offload_rsp(struct ibmvnic_adapter *adapter)
53195329
{
53205330
struct device *dev = &adapter->vdev->dev;
53215331
struct ibmvnic_query_ip_offload_buffer *buf = &adapter->ip_offload_buf;
5322-
int i;
53235332

53245333
dma_unmap_single(dev, adapter->ip_offload_tok,
53255334
sizeof(adapter->ip_offload_buf), DMA_FROM_DEVICE);
53265335

53275336
netdev_dbg(adapter->netdev, "Query IP Offload Buffer:\n");
5328-
for (i = 0; i < (sizeof(adapter->ip_offload_buf) - 1) / 8 + 1; i++)
5329-
netdev_dbg(adapter->netdev, "%016lx\n",
5330-
((unsigned long *)(buf))[i]);
5337+
ibmvnic_print_hex_dump(adapter->netdev, buf,
5338+
sizeof(adapter->ip_offload_buf));
53315339

53325340
netdev_dbg(adapter->netdev, "ipv4_chksum = %d\n", buf->ipv4_chksum);
53335341
netdev_dbg(adapter->netdev, "ipv6_chksum = %d\n", buf->ipv6_chksum);
@@ -5558,10 +5566,8 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq,
55585566
netdev->mtu = adapter->req_mtu - ETH_HLEN;
55595567

55605568
netdev_dbg(adapter->netdev, "Login Response Buffer:\n");
5561-
for (i = 0; i < (adapter->login_rsp_buf_sz - 1) / 8 + 1; i++) {
5562-
netdev_dbg(adapter->netdev, "%016lx\n",
5563-
((unsigned long *)(adapter->login_rsp_buf))[i]);
5564-
}
5569+
ibmvnic_print_hex_dump(netdev, adapter->login_rsp_buf,
5570+
adapter->login_rsp_buf_sz);
55655571

55665572
/* Sanity checks */
55675573
if (login->num_txcomp_subcrqs != login_rsp->num_txsubm_subcrqs ||

0 commit comments

Comments
 (0)