[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250113221721.362093-4-nnac123@linux.ibm.com>
Date: Mon, 13 Jan 2025 16:17:21 -0600
From: Nick Child <nnac123@...ux.ibm.com>
To: linux-kernel@...r.kernel.org
Cc: nick.child@....com, netdev@...r.kernel.org,
Nick Child <nnac123@...ux.ibm.com>
Subject: [PATCH 3/3] ibmvnic: Print data buffers with kernel API's
Previously, data buffers that were to be printed were cast to 8 byte
integers and printed. This can lead to buffer overflow if the length
of the buffer is not a multiple of 8.
Simplify and safeguard printing by using kernel provided functions
to print these data blobs.
Signed-off-by: Nick Child <nnac123@...ux.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index e95ae0d39948..a8f1feb9a2e7 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -4834,6 +4834,7 @@ static int send_login(struct ibmvnic_adapter *adapter)
struct device *dev = &adapter->vdev->dev;
struct vnic_login_client_data *vlcd;
dma_addr_t rsp_buffer_token;
+ unsigned char hex_str[16 * 3];
dma_addr_t buffer_token;
size_t rsp_buffer_size;
union ibmvnic_crq crq;
@@ -4937,9 +4938,9 @@ static int send_login(struct ibmvnic_adapter *adapter)
vnic_add_client_data(adapter, vlcd);
netdev_dbg(adapter->netdev, "Login Buffer:\n");
- for (i = 0; i < (adapter->login_buf_sz - 1) / 8 + 1; i++) {
- netdev_dbg(adapter->netdev, "%016lx\n",
- ((unsigned long *)(adapter->login_buf))[i]);
+ for_each_line_in_hex_dump(i, 16, hex_str, sizeof(hex_str), 8,
+ adapter->login_buf, adapter->login_buf_sz) {
+ netdev_dbg(adapter->netdev, "%s\n", hex_str);
}
memset(&crq, 0, sizeof(crq));
@@ -5317,15 +5318,17 @@ static void handle_query_ip_offload_rsp(struct ibmvnic_adapter *adapter)
{
struct device *dev = &adapter->vdev->dev;
struct ibmvnic_query_ip_offload_buffer *buf = &adapter->ip_offload_buf;
+ unsigned char hex_str[16 * 3];
int i;
dma_unmap_single(dev, adapter->ip_offload_tok,
sizeof(adapter->ip_offload_buf), DMA_FROM_DEVICE);
netdev_dbg(adapter->netdev, "Query IP Offload Buffer:\n");
- for (i = 0; i < (sizeof(adapter->ip_offload_buf) - 1) / 8 + 1; i++)
- netdev_dbg(adapter->netdev, "%016lx\n",
- ((unsigned long *)(buf))[i]);
+ for_each_line_in_hex_dump(i, 16, hex_str, sizeof(hex_str), 8, buf,
+ sizeof(adapter->ip_offload_buf)) {
+ netdev_dbg(adapter->netdev, "%s\n", hex_str);
+ }
netdev_dbg(adapter->netdev, "ipv4_chksum = %d\n", buf->ipv4_chksum);
netdev_dbg(adapter->netdev, "ipv6_chksum = %d\n", buf->ipv6_chksum);
@@ -5518,6 +5521,7 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq,
struct net_device *netdev = adapter->netdev;
struct ibmvnic_login_rsp_buffer *login_rsp = adapter->login_rsp_buf;
struct ibmvnic_login_buffer *login = adapter->login_buf;
+ unsigned char hex_str[16 * 3];
u64 *tx_handle_array;
u64 *rx_handle_array;
int num_tx_pools;
@@ -5556,9 +5560,10 @@ static int handle_login_rsp(union ibmvnic_crq *login_rsp_crq,
netdev->mtu = adapter->req_mtu - ETH_HLEN;
netdev_dbg(adapter->netdev, "Login Response Buffer:\n");
- for (i = 0; i < (adapter->login_rsp_buf_sz - 1) / 8 + 1; i++) {
- netdev_dbg(adapter->netdev, "%016lx\n",
- ((unsigned long *)(adapter->login_rsp_buf))[i]);
+ for_each_line_in_hex_dump(i, 16, hex_str, sizeof(hex_str), 8,
+ adapter->login_rsp_buf,
+ adapter->login_rsp_buf_sz) {
+ netdev_dbg(adapter->netdev, "%s\n", hex_str);
}
/* Sanity checks */
--
2.47.1
Powered by blists - more mailing lists