git: 9c0707ed9ff1 - stable/12 - ixgbe(4): Eliminate bogus sizeof() expressions

Kevin Bowling kbowling at FreeBSD.org
Sun Oct 3 05:04:23 UTC 2021


The branch stable/12 has been updated by kbowling (ports committer):

URL: https://cgit.FreeBSD.org/src/commit/?id=9c0707ed9ff150718fe8e0215c4c9fe8f4bc7f4a

commit 9c0707ed9ff150718fe8e0215c4c9fe8f4bc7f4a
Author:     Conrad Meyer <cem at FreeBSD.org>
AuthorDate: 2020-01-29 05:31:40 +0000
Commit:     Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-10-03 01:54:38 +0000

    ixgbe(4): Eliminate bogus sizeof() expressions
    
    All of these uses of sizeof() were on the wrong type in relation to the pointer
    passed to SYSCTL_ADD_PROC as arg1.  Fortunately, none of the handlers actually
    use arg2.  So just don't pass a (non-zero) arg2.
    
    Reported by:    Coverity
    CID:            1007701
    
    (cherry picked from commit d09fbcd0b6eae765a190eaa4dc931050af7bd25f)
---
 sys/dev/ixgbe/if_ix.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c
index fa52b58ac1bd..339f6a32db2f 100644
--- a/sys/dev/ixgbe/if_ix.c
+++ b/sys/dev/ixgbe/if_ix.c
@@ -1587,10 +1587,10 @@ ixgbe_add_hw_stats(struct ixgbe_softc *sc)
 		queue_list = SYSCTL_CHILDREN(queue_node);
 
 		SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_head",
-		    CTLTYPE_UINT | CTLFLAG_RD, txr, sizeof(txr),
+		    CTLTYPE_UINT | CTLFLAG_RD, txr, 0,
 		    ixgbe_sysctl_tdh_handler, "IU", "Transmit Descriptor Head");
 		SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_tail",
-		    CTLTYPE_UINT | CTLFLAG_RD, txr, sizeof(txr),
+		    CTLTYPE_UINT | CTLFLAG_RD, txr, 0,
 		    ixgbe_sysctl_tdt_handler, "IU", "Transmit Descriptor Tail");
 		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tso_tx",
 		    CTLFLAG_RD, &txr->tso_tx, "TSO");
@@ -1607,18 +1607,17 @@ ixgbe_add_hw_stats(struct ixgbe_softc *sc)
 		queue_list = SYSCTL_CHILDREN(queue_node);
 
 		SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "interrupt_rate",
-		    CTLTYPE_UINT | CTLFLAG_RW, &sc->rx_queues[i],
-		    sizeof(&sc->rx_queues[i]),
+		    CTLTYPE_UINT | CTLFLAG_RW, &sc->rx_queues[i], 0,
 		    ixgbe_sysctl_interrupt_rate_handler, "IU",
 		    "Interrupt Rate");
 		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "irqs",
 		    CTLFLAG_RD, &(sc->rx_queues[i].irqs),
 		    "irqs on this queue");
 		SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_head",
-		    CTLTYPE_UINT | CTLFLAG_RD, rxr, sizeof(rxr),
+		    CTLTYPE_UINT | CTLFLAG_RD, rxr, 0,
 		    ixgbe_sysctl_rdh_handler, "IU", "Receive Descriptor Head");
 		SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_tail",
-		    CTLTYPE_UINT | CTLFLAG_RD, rxr, sizeof(rxr),
+		    CTLTYPE_UINT | CTLFLAG_RD, rxr, 0,
 		    ixgbe_sysctl_rdt_handler, "IU", "Receive Descriptor Tail");
 		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "rx_packets",
 		    CTLFLAG_RD, &rxr->rx_packets, "Queue Packets Received");


More information about the dev-commits-src-all mailing list