Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6f19f8b authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

fm10k: use snprintf() instead of sprintf() to avoid buffer overflow 



Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f079fa00

drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ void fm10k_dbg_q_vector_init(struct fm10k_q_vector *q_vector) 
		return;

		return;





	/* Generate a folder for each q_vector */

	/* Generate a folder for each q_vector */

	sprintf(name, "q_vector.%03d", q_vector->v_idx);

	snprintf(name, sizeof(name), "q_vector.%03d", q_vector->v_idx);





	q_vector->dbg_q_vector = debugfs_create_dir(name, interface->dbg_intfc);

	q_vector->dbg_q_vector = debugfs_create_dir(name, interface->dbg_intfc);

	if (!q_vector->dbg_q_vector)

	if (!q_vector->dbg_q_vector)
@@ -186,7 +186,7 @@ void fm10k_dbg_q_vector_init(struct fm10k_q_vector *q_vector) 
	for (i = 0; i < q_vector->tx.count; i++) {

	for (i = 0; i < q_vector->tx.count; i++) {

		struct fm10k_ring *ring = &q_vector->tx.ring[i];

		struct fm10k_ring *ring = &q_vector->tx.ring[i];





		sprintf(name, "tx_ring.%03d", ring->queue_index);

		snprintf(name, sizeof(name), "tx_ring.%03d", ring->queue_index);





		debugfs_create_file(name, 0600,

		debugfs_create_file(name, 0600,

				    q_vector->dbg_q_vector, ring,

				    q_vector->dbg_q_vector, ring,
@@ -197,7 +197,7 @@ void fm10k_dbg_q_vector_init(struct fm10k_q_vector *q_vector) 
	for (i = 0; i < q_vector->rx.count; i++) {

	for (i = 0; i < q_vector->rx.count; i++) {

		struct fm10k_ring *ring = &q_vector->rx.ring[i];

		struct fm10k_ring *ring = &q_vector->rx.ring[i];





		sprintf(name, "rx_ring.%03d", ring->queue_index);

		snprintf(name, sizeof(name), "rx_ring.%03d", ring->queue_index);





		debugfs_create_file(name, 0600,

		debugfs_create_file(name, 0600,

				    q_vector->dbg_q_vector, ring,

				    q_vector->dbg_q_vector, ring,

drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -206,13 +206,13 @@ static void fm10k_get_stat_strings(struct net_device *dev, u8 *data) 
	}

	}





	for (i = 0; i < interface->hw.mac.max_queues; i++) {

	for (i = 0; i < interface->hw.mac.max_queues; i++) {

		sprintf(p, "tx_queue_%u_packets", i);

		snprintf(p, ETH_GSTRING_LEN, "tx_queue_%u_packets", i);

		p += ETH_GSTRING_LEN;

		p += ETH_GSTRING_LEN;

		sprintf(p, "tx_queue_%u_bytes", i);

		snprintf(p, ETH_GSTRING_LEN, "tx_queue_%u_bytes", i);

		p += ETH_GSTRING_LEN;

		p += ETH_GSTRING_LEN;

		sprintf(p, "rx_queue_%u_packets", i);

		snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_packets", i);

		p += ETH_GSTRING_LEN;

		p += ETH_GSTRING_LEN;

		sprintf(p, "rx_queue_%u_bytes", i);

		snprintf(p, ETH_GSTRING_LEN, "rx_queue_%u_bytes", i);

		p += ETH_GSTRING_LEN;

		p += ETH_GSTRING_LEN;

	}

	}

}

}