Skip to content

Commit

Permalink
Merge branch 'net-string-format-safety-updates'
Browse files Browse the repository at this point in the history
Simon Horman says:

====================
net: String format safety updates

This series addresses string format safety issues that are
flagged by tooling in files touched by recent patches.

I do not believe that any of these issues are bugs.
Rather, I am providing these updates as I think there is a value
in addressing such warnings so real problems stand out.

v1: https://lore.kernel.org/20241011-string-thing-v1-0-acc506568033@kernel.org
====================

Link: https://patch.msgid.link/20241014-string-thing-v2-0-b9b29625060a@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Jakub Kicinski committed Oct 15, 2024
2 parents 0241720 + d6488e7 commit b1a39cd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/net/dsa/microchip/ksz_ptp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ static int ksz_ptp_msg_irq_setup(struct ksz_port *port, u8 n)
ptpmsg_irq->port = port;
ptpmsg_irq->ts_reg = ops->get_port_addr(port->num, ts_reg[n]);

snprintf(ptpmsg_irq->name, sizeof(ptpmsg_irq->name), name[n]);
strscpy(ptpmsg_irq->name, name[n]);

ptpmsg_irq->num = irq_find_mapping(port->ptpirq.domain, n);
if (ptpmsg_irq->num < 0)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ static int txgbe_clock_register(struct txgbe *txgbe)
if (IS_ERR(clk))
return PTR_ERR(clk);

clock = clkdev_create(clk, NULL, clk_name);
clock = clkdev_create(clk, NULL, "%s", clk_name);
if (!clock) {
clk_unregister(clk);
return -ENOMEM;
Expand Down

0 comments on commit b1a39cd

Please sign in to comment.