tsnep: Fix tsnep_request_irq() format-overflow warning
authorGerhard Engleder <gerhard@engleder-embedded.com>
Mon, 23 Oct 2023 18:38:56 +0000 (20:38 +0200)
committerJakub Kicinski <kuba@kernel.org>
Tue, 24 Oct 2023 20:05:28 +0000 (13:05 -0700)
Compiler warns about a possible format-overflow in tsnep_request_irq():
drivers/net/ethernet/engleder/tsnep_main.c:884:55: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=]
                         sprintf(queue->name, "%s-rx-%d", name,
                                                       ^
drivers/net/ethernet/engleder/tsnep_main.c:881:55: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=]
                         sprintf(queue->name, "%s-tx-%d", name,
                                                       ^
drivers/net/ethernet/engleder/tsnep_main.c:878:49: warning: '-txrx-' directive writing 6 bytes into a region of size between 5 and 25 [-Wformat-overflow=]
                         sprintf(queue->name, "%s-txrx-%d", name,
                                                 ^~~~~~

Actually overflow cannot happen. Name is limited to IFNAMSIZ, because
netdev_name() is called during ndo_open(). queue_index is single char,
because less than 10 queues are supported.

Fix warning with snprintf(). Additionally increase buffer to 32 bytes,
because those 7 additional bytes were unused anyway.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202310182028.vmDthIUa-lkp@intel.com/
Signed-off-by: Gerhard Engleder <gerhard@engleder-embedded.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20231023183856.58373-1-gerhard@engleder-embedded.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/engleder/tsnep.h
drivers/net/ethernet/engleder/tsnep_main.c

index 6e14c918e3fb71966d8ee794569383c3164e26f4..f188fba021a621532419e057a11e56630fc69fef 100644 (file)
@@ -143,7 +143,7 @@ struct tsnep_rx {
 
 struct tsnep_queue {
        struct tsnep_adapter *adapter;
-       char name[IFNAMSIZ + 9];
+       char name[IFNAMSIZ + 16];
 
        struct tsnep_tx *tx;
        struct tsnep_rx *rx;
index f16b6b3e21a627aa7ed60c72d95d551a6ceab856..df40c720e7b23d517433743efb883edb8f8d4cf4 100644 (file)
@@ -1830,14 +1830,14 @@ static int tsnep_request_irq(struct tsnep_queue *queue, bool first)
                dev = queue->adapter;
        } else {
                if (queue->tx && queue->rx)
-                       sprintf(queue->name, "%s-txrx-%d", name,
-                               queue->rx->queue_index);
+                       snprintf(queue->name, sizeof(queue->name), "%s-txrx-%d",
+                                name, queue->rx->queue_index);
                else if (queue->tx)
-                       sprintf(queue->name, "%s-tx-%d", name,
-                               queue->tx->queue_index);
+                       snprintf(queue->name, sizeof(queue->name), "%s-tx-%d",
+                                name, queue->tx->queue_index);
                else
-                       sprintf(queue->name, "%s-rx-%d", name,
-                               queue->rx->queue_index);
+                       snprintf(queue->name, sizeof(queue->name), "%s-rx-%d",
+                                name, queue->rx->queue_index);
                handler = tsnep_irq_txrx;
                dev = queue;
        }