From 29a3ad1ba94d7d2614201831c9119560a1885343 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 27 Jan 2023 17:44:59 -0600 Subject: grlib: Fix snprintf() overflow warnings from gcc 12 Updates #4662. --- bsps/shared/grlib/1553/b1553brm.c | 2 +- bsps/shared/grlib/1553/b1553rt.c | 2 +- bsps/shared/grlib/analog/gradcdac.c | 2 +- bsps/shared/grlib/can/grcan_internal.h | 2 +- bsps/shared/grlib/can/occan.c | 2 +- bsps/shared/grlib/gpio/grgpio.c | 4 ++-- bsps/shared/grlib/i2c/i2cmst.c | 2 +- bsps/shared/grlib/pwm/grpwm.c | 2 +- bsps/shared/grlib/spi/spictrl.c | 2 +- bsps/shared/grlib/spw/grspw.c | 2 +- bsps/shared/grlib/tmtc/grtc.c | 2 +- bsps/shared/grlib/tmtc/grtm.c | 2 +- bsps/shared/grlib/uart/apbuart_cons.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) (limited to 'bsps/shared') diff --git a/bsps/shared/grlib/1553/b1553brm.c b/bsps/shared/grlib/1553/b1553brm.c index ee5f9fbef9..7e0b9924e6 100644 --- a/bsps/shared/grlib/1553/b1553brm.c +++ b/bsps/shared/grlib/1553/b1553brm.c @@ -119,7 +119,7 @@ struct irq_log_list { typedef struct { struct drvmgr_dev *dev; /* Driver manager device */ - char devName[32]; /* Device Name */ + char devName[52]; /* Device Name */ struct brm_reg *regs; unsigned int memarea_base; diff --git a/bsps/shared/grlib/1553/b1553rt.c b/bsps/shared/grlib/1553/b1553rt.c index 43bbeaa08c..7a4e2535bd 100644 --- a/bsps/shared/grlib/1553/b1553rt.c +++ b/bsps/shared/grlib/1553/b1553rt.c @@ -87,7 +87,7 @@ static rtems_driver_address_table b1553rt_driver = RT_DRIVER_TABLE_ENTRY; typedef struct { struct drvmgr_dev *dev; /* Driver manager device */ - char devName[32]; /* Device Name */ + char devName[52]; /* Device Name */ struct rt_reg *regs; unsigned int ctrl_copy; /* Local copy of config register */ diff --git a/bsps/shared/grlib/analog/gradcdac.c b/bsps/shared/grlib/analog/gradcdac.c index 3b1afa80cb..09f8760bcd 100644 --- a/bsps/shared/grlib/analog/gradcdac.c +++ b/bsps/shared/grlib/analog/gradcdac.c @@ -53,7 +53,7 @@ struct gradcdac_priv { struct gradcdac_regs *regs; /* Must be first */ struct drvmgr_dev *dev; - char devName[48]; + char devName[54]; /* Must be at least 48 per names */ unsigned int freq; int irqno; diff --git a/bsps/shared/grlib/can/grcan_internal.h b/bsps/shared/grlib/can/grcan_internal.h index 16aabbaba7..d27476a985 100644 --- a/bsps/shared/grlib/can/grcan_internal.h +++ b/bsps/shared/grlib/can/grcan_internal.h @@ -56,7 +56,7 @@ struct grcan_config { struct grcan_priv { struct drvmgr_dev *dev; /* Driver manager device */ - char devName[32]; /* Device Name */ + char devName[52]; /* Device Name */ unsigned int baseaddr, ram_base; struct grcan_regs *regs; int irq; diff --git a/bsps/shared/grlib/can/occan.c b/bsps/shared/grlib/can/occan.c index 51ffd07c9b..a6b37ec74c 100644 --- a/bsps/shared/grlib/can/occan.c +++ b/bsps/shared/grlib/can/occan.c @@ -226,7 +226,7 @@ typedef struct { typedef struct { struct drvmgr_dev *dev; - char devName[32]; + char devName[52]; SPIN_DECLARE(devlock); /* hardware shortcuts */ diff --git a/bsps/shared/grlib/gpio/grgpio.c b/bsps/shared/grlib/gpio/grgpio.c index d5794328a6..711293dd15 100644 --- a/bsps/shared/grlib/gpio/grgpio.c +++ b/bsps/shared/grlib/gpio/grgpio.c @@ -379,12 +379,12 @@ static int grgpio_gpiolib_get_info(void *handle, struct gpiolib_info *pinfo) /* Failed to get prefix, make sure of a unique FS name * by using the driver minor. */ - snprintf(pinfo->devName, 64, "/dev/grgpio%d/%d", dev->minor_drv, portnr); + snprintf(pinfo->devName, 80, "/dev/grgpio%d/%d", dev->minor_drv, portnr); } else { /* Got special prefix, this means we have a bus prefix * And we should use our "bus minor" */ - snprintf(pinfo->devName, 64, "/dev/%sgrgpio%d/%d", prefix, dev->minor_bus, portnr); + snprintf(pinfo->devName, 80, "/dev/%sgrgpio%d/%d", prefix, dev->minor_bus, portnr); } return 0; diff --git a/bsps/shared/grlib/i2c/i2cmst.c b/bsps/shared/grlib/i2c/i2cmst.c index 68d414019b..70c796bbce 100644 --- a/bsps/shared/grlib/i2c/i2cmst.c +++ b/bsps/shared/grlib/i2c/i2cmst.c @@ -375,7 +375,7 @@ int i2cmst_init3(struct drvmgr_dev *dev) { gr_i2cmst_prv_t *priv; char prefix[32]; - char devName[32]; + char devName[50]; int rc; priv = (gr_i2cmst_prv_t *)dev->priv; diff --git a/bsps/shared/grlib/pwm/grpwm.c b/bsps/shared/grlib/pwm/grpwm.c index 22d08314c7..32d16a2da8 100644 --- a/bsps/shared/grlib/pwm/grpwm.c +++ b/bsps/shared/grlib/pwm/grpwm.c @@ -169,7 +169,7 @@ struct grpwm_regs { struct grpwm_priv { struct drvmgr_dev *dev; struct grpwm_regs *regs; - char devName[32]; + char devName[52]; int irq; int open; diff --git a/bsps/shared/grlib/spi/spictrl.c b/bsps/shared/grlib/spi/spictrl.c index d4b62a390b..081d281037 100644 --- a/bsps/shared/grlib/spi/spictrl.c +++ b/bsps/shared/grlib/spi/spictrl.c @@ -251,7 +251,7 @@ int spictrl_init3(struct drvmgr_dev *dev) { struct spictrl_priv *priv; char prefix[32]; - char devName[32]; + char devName[48]; int rc; priv = (struct spictrl_priv *)dev->priv; diff --git a/bsps/shared/grlib/spw/grspw.c b/bsps/shared/grlib/spw/grspw.c index 15fc34fe63..80fb26370e 100644 --- a/bsps/shared/grlib/spw/grspw.c +++ b/bsps/shared/grlib/spw/grspw.c @@ -108,7 +108,7 @@ typedef struct { typedef struct { /* configuration parameters */ struct drvmgr_dev *dev; /* Driver manager device */ - char devName[32]; /* Device Name */ + char devName[49]; /* Device Name */ LEON3_SPACEWIRE_Regs_Map *regs; spw_config config; diff --git a/bsps/shared/grlib/tmtc/grtc.c b/bsps/shared/grlib/tmtc/grtc.c index f7c97c2b3f..4cb9a06ed0 100644 --- a/bsps/shared/grlib/tmtc/grtc.c +++ b/bsps/shared/grlib/tmtc/grtc.c @@ -241,7 +241,7 @@ struct grtc_frame_pool { struct grtc_priv { struct drvmgr_dev *dev; /* Driver manager device */ - char devName[32]; /* Device Name */ + char devName[52]; /* Device Name */ struct grtc_regs *regs; /* TC Hardware Register MAP */ int irq; /* IRQ number of TC core */ SPIN_DECLARE(devlock); /* spin-lock of registers */ diff --git a/bsps/shared/grlib/tmtc/grtm.c b/bsps/shared/grlib/tmtc/grtm.c index f40069675d..a1b2a546fe 100644 --- a/bsps/shared/grlib/tmtc/grtm.c +++ b/bsps/shared/grlib/tmtc/grtm.c @@ -367,7 +367,7 @@ struct grtm_ring { struct grtm_priv { struct drvmgr_dev *dev; /* Driver manager device */ - char devName[32]; /* Device Name */ + char devName[52]; /* Device Name */ struct grtm_regs *regs; int irq; int minor; diff --git a/bsps/shared/grlib/uart/apbuart_cons.c b/bsps/shared/grlib/uart/apbuart_cons.c index e5f41f4ca2..5d47b7f4a1 100644 --- a/bsps/shared/grlib/uart/apbuart_cons.c +++ b/bsps/shared/grlib/uart/apbuart_cons.c @@ -76,7 +76,7 @@ struct apbuart_priv { struct drvmgr_dev *dev; struct apbuart_regs *regs; struct rtems_termios_tty *tty; - char devName[32]; + char devName[52]; volatile int sending; int mode; int cap; -- cgit v1.2.3