Skip to content

Commit 758ca4c

Browse files
zandreyCaesar-github
authored andcommitted
UPSTREAM: tools lib api fs: Fix gcc9 stringop-truncation compilation error
GCC9 introduced string hardening mechanisms, which exhibits the error during fs api compilation: error: '__builtin_strncpy' specified bound 4096 equals destination size [-Werror=stringop-truncation] This comes when the length of copy passed to strncpy is is equal to destination size, which could potentially lead to buffer overflow. There is a need to mitigate this potential issue by limiting the size of destination by 1 and explicitly terminate the destination with NULL. Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> Reviewed-by: Petr Mladek <pmladek@suse.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Andrii Nakryiko <andriin@fb.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Kefeng Wang <wangkefeng.wang@huawei.com> Cc: Martin KaFai Lau <kafai@fb.com> Cc: Petr Mladek <pmladek@suse.com> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Song Liu <songliubraving@fb.com> Cc: Yonghong Song <yhs@fb.com> Cc: bpf@vger.kernel.org Cc: netdev@vger.kernel.org Link: http://lore.kernel.org/lkml/20191211080109.18765-1-andrey.zhizhikin@leica-geosystems.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> (cherry picked from commit 6794200fa3c9c3e6759dae099145f23e4310f4f7) Signed-off-by: Caesar Wang <wxt@rock-chips.com> Change-Id: Ief72070858516a70e9205215f194115e6f3f6c2d
1 parent f731f94 commit 758ca4c

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

  • tools/lib/api/fs

tools/lib/api/fs/fs.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ static bool fs__env_override(struct fs *fs)
179179
size_t name_len = strlen(fs->name);
180180
/* name + "_PATH" + '\0' */
181181
char upper_name[name_len + 5 + 1];
182+
182183
memcpy(upper_name, fs->name, name_len);
183184
mem_toupper(upper_name, name_len);
184185
strcpy(&upper_name[name_len], "_PATH");
@@ -188,7 +189,8 @@ static bool fs__env_override(struct fs *fs)
188189
return false;
189190

190191
fs->found = true;
191-
strncpy(fs->path, override_path, sizeof(fs->path));
192+
strncpy(fs->path, override_path, sizeof(fs->path) - 1);
193+
fs->path[sizeof(fs->path) - 1] = '\0';
192194
return true;
193195
}
194196

0 commit comments

Comments
 (0)