Skip to content

Commit 7c02f6a

Browse files
emuslnkuba-moo
authored andcommitted
pds_core: fix up some format-truncation complaints
Our friendly kernel test robot pointed out a couple of potential string truncation issues. None of which were we worried about, but can be relatively easily fixed to quiet the complaints. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202310211736.66syyDpp-lkp@intel.com/ Fixes: 45d76f4 ("pds_core: set up device and adminq") Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> Link: https://lore.kernel.org/r/20231113183257.71110-3-shannon.nelson@amd.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 09d4c14 commit 7c02f6a

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

drivers/net/ethernet/amd/pds_core/core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define PDSC_DRV_DESCRIPTION "AMD/Pensando Core Driver"
1616

1717
#define PDSC_WATCHDOG_SECS 5
18-
#define PDSC_QUEUE_NAME_MAX_SZ 32
18+
#define PDSC_QUEUE_NAME_MAX_SZ 16
1919
#define PDSC_ADMINQ_MIN_LENGTH 16 /* must be a power of two */
2020
#define PDSC_NOTIFYQ_LENGTH 64 /* must be a power of two */
2121
#define PDSC_TEARDOWN_RECOVERY false

drivers/net/ethernet/amd/pds_core/dev.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,14 @@ static int pdsc_identify(struct pdsc *pdsc)
261261
struct pds_core_drv_identity drv = {};
262262
size_t sz;
263263
int err;
264+
int n;
264265

265266
drv.drv_type = cpu_to_le32(PDS_DRIVER_LINUX);
266-
snprintf(drv.driver_ver_str, sizeof(drv.driver_ver_str),
267-
"%s %s", PDS_CORE_DRV_NAME, utsname()->release);
267+
/* Catching the return quiets a Wformat-truncation complaint */
268+
n = snprintf(drv.driver_ver_str, sizeof(drv.driver_ver_str),
269+
"%s %s", PDS_CORE_DRV_NAME, utsname()->release);
270+
if (n > sizeof(drv.driver_ver_str))
271+
dev_dbg(pdsc->dev, "release name truncated, don't care\n");
268272

269273
/* Next let's get some info about the device
270274
* We use the devcmd_lock at this level in order to

drivers/net/ethernet/amd/pds_core/devlink.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req,
104104
struct pds_core_fw_list_info fw_list;
105105
struct pdsc *pdsc = devlink_priv(dl);
106106
union pds_core_dev_comp comp;
107-
char buf[16];
107+
char buf[32];
108108
int listlen;
109109
int err;
110110
int i;

0 commit comments

Comments
 (0)