From: David Laight <[email protected]> Use the returned length to update the pointers. Discard the parameter if there isnt room (shouldn not happen).
Signed-off-by: David Laight <[email protected]> --- This is one of a group of patches that remove potentially unbounded strcpy() calls. They are mostly replaced by strscpy() or, when strlen() has just been called, with memcpy() (usually including the '\0'). Calls with copy string literals into arrays are left unchanged. They are safe and easily detected as such. The changes were made by getting the compiler to detect the calls and then fixing the code by hand. Note that all the changes are only compile tested. Some Makefiles were changed to allow files to contain strcpy(). As well as 'difficult to fix' files, this included 'show' functions as they really need to use sysfs_emit() or seq_printf(). All the patches are being sent individually to avoid very long cc lists. Apologies for the terse commit messages and likely unexpected tags. (There are about 100 patches in total.) drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c index fd77ab6568cb..c7a8e5ad517b 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_msg.c @@ -663,18 +663,26 @@ static inline void hypervisor_ppn_remove(PPN64 pfn) */ static inline char *mksstat_init_record_time(mksstat_kern_stats_t stat_idx, - MKSGuestStatCounterTime *pstat, MKSGuestStatInfoEntry *pinfo, char *pstrs) + MKSGuestStatCounterTime *pstat, MKSGuestStatInfoEntry *pinfo, char *pstrs, char *lim) { - char *const pstrd = pstrs + strlen(mksstat_kern_name_desc[stat_idx][0]) + 1; - strcpy(pstrs, mksstat_kern_name_desc[stat_idx][0]); - strcpy(pstrd, mksstat_kern_name_desc[stat_idx][1]); + char *pstrd; + int len; + + len = strscpy(pstrs, mksstat_kern_name_desc[stat_idx][0], lim - pstrs); + if (len < 0) + return pstrs; + + pstrd = pstrs + len + 1; + len = strscpy(pstrd, mksstat_kern_name_desc[stat_idx][1], lim - pstrd); + if (len < 0) + return pstrs; pinfo[stat_idx].name.s = pstrs; pinfo[stat_idx].description.s = pstrd; pinfo[stat_idx].flags = MKS_GUEST_STAT_FLAG_TIME; pinfo[stat_idx].stat.counterTime = &pstat[stat_idx]; - return pstrd + strlen(mksstat_kern_name_desc[stat_idx][1]) + 1; + return pstrd + len + 1; } /** @@ -709,8 +717,8 @@ static int mksstat_init_kern_id(struct page **ppage) /* Set up all kernel-internal counters and corresponding structures */ pstrs_acc = pstrs; - pstrs_acc = mksstat_init_record_time(MKSSTAT_KERN_EXECBUF, pstat, pinfo, pstrs_acc); - pstrs_acc = mksstat_init_record_time(MKSSTAT_KERN_COTABLE_RESIZE, pstat, pinfo, pstrs_acc); + pstrs_acc = mksstat_init_record_time(MKSSTAT_KERN_EXECBUF, pstat, pinfo, pstrs_acc, pstrs + PAGE_SIZE); + pstrs_acc = mksstat_init_record_time(MKSSTAT_KERN_COTABLE_RESIZE, pstat, pinfo, pstrs_acc, pstrs + PAGE_SIZE); /* Add new counters above, in their order of appearance in mksstat_kern_stats_t */ -- 2.39.5
