strlcpy() and strlcat() for iproute2
Subsystems (3)
cover strlcpy() and strlcat() for iproute2
The following series adds my own implementations of strlcpy() and strlcat() in patch 1 and changes the code to make use of them in the following patches but the last two: Patch 5 just eliminates a line of useless code I found while searching for potential users of the introduced functions, patch 6 sanitizes a call to strncpy() in misc/lnstat_util.c without using strlcpy() since lnstat is not being linked against libutil.
I implemented both functions solely based on information in libbsd's man pages, so they are safe to be released under the GPL.
Phil Sutter (6):
utils: Implement strlcpy() and strlcat() Convert the obvious cases to strlcpy() Convert harmful calls to strncpy() to strlcpy()
ipxfrm: Replace STRBUF_CAT macro with strlcat()
tc_util: No need to terminate an snprintf'ed buffer
lnstat_util: Make sure buffer is NUL-terminated
genl/ctrl.c | 2 +- include/utils.h | 3 +++ ip/ipnetns.c | 3 +-- ip/iproute_lwtunnel.c | 3 +-- ip/ipvrf.c | 5 ++--- ip/ipxfrm.c | 21 +++++---------------- ip/xfrm_state.c | 2 +- lib/bpf.c | 3 +-- lib/fs.c | 3 +-- lib/inet_proto.c | 3 +-- lib/utils.c | 19 +++++++++++++++++++ misc/lnstat_util.c | 3 ++- misc/ss.c | 3 +-- tc/em_ipset.c | 3 +-- tc/tc_util.c | 1 - 15 files changed, 40 insertions(+), 37 deletions(-)
Signature · 1 line
2.13.1
PATCH 1/6 utils: Implement strlcpy() and strlcat()
By making use of strncpy(), both implementations are really simple so there is no need to add libbsd as additional dependency.
--- include/utils.h | 3 +++ lib/utils.c | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+)
include/utils.h +3 -0
@@ -252,4 +252,7 @@ int make_path(const char *path, mode_t mode);char *find_cgroup2_mount (void );int get_command_name (const char *pid,char *comm,size_t len); +size_t strlcpy (char *dst,const char *src,size_t size); +size_t strlcat (char *dst,const char *src,size_t size); +#endif /* __UTILS_H__ */
lib/utils.c +19 -0
@@ -1238,3 +1238,22 @@ int get_real_family(int rtm_type, int rtm_family)return rtm_family; } + +size_t strlcpy (char *dst,const char *src,size_t size) +{ +if (size) { +strncpy (dst, src, size -1 ); + dst[size -1 ] ='\0' ; + } +return strlen (src); +} + +size_t strlcat (char *dst,const char *src,size_t size) +{ +size_t dlen =strlen (dst); + +if (dlen > size) +return dlen +strlen (src); + +return dlen +strlcpy (dst + dlen, src, size - dlen); +}
Signature · 1 line
2.13.1
RE: [iproute PATCH 1/6] utils: Implement strlcpy() and strlcat()
From: Phil Sutter
Quoted 4 lines
Sent: 01 September 2017 17:53
By making use ofstrncpy(), both implementations are really simple so there is no need to add libbsd as additional dependency.
...
lib/utils.c int get_real_family(int rtm_type, int rtm_family) · line 1249
Quoted 9 lines
lib/utils.c +9
-0+ +size_t strlcpy (char *dst,const char *src,size_t size) +{ +if (size) { +strncpy (dst, src, size -1 ); + dst[size -1 ] ='\0' ; + } +return strlen (src); +}
Except that isn't really strlcpy().
Better would be:
len = strlen(src) + 1;
if (len <= size)
memcpy(dst, src, len);
else if (size) {
dst[size - 1] = 0;
memcpy(dst, src, size - 1);
}
return len - 1;WTF strlcpy() has that return value I don't know.
David
Re: [iproute PATCH 1/6] utils: Implement strlcpy() and strlcat()
Quoted 18 lines · David Laight
From: Phil Sutter
Quoted 4 lines
Sent: 01 September 2017 17:53
By making use ofstrncpy(), both implementations are really simple so there is no need to add libbsd as additional dependency....
lib/utils.c int get_real_family(int rtm_type, int rtm_family) · line 1249
Quoted 9 lines
lib/utils.c +9
-0+ +size_t strlcpy (char *dst,const char *src,size_t size) +{ +if (size) { +strncpy (dst, src, size -1 ); + dst[size -1 ] ='\0' ; + } +return strlen (src); +}Except that isn't really
strlcpy().
Better would be:
Quoted 8 lines
len = strlen(src) + 1;
if (len <= size)
memcpy(dst, src, len);
else if (size) {
dst[size - 1] = 0;
memcpy(dst, src, size - 1);
}
return len - 1;Please elaborate: Why isn't my version "really" strlcpy()? Why is your proposed version better?
Thanks, Phil
Re: [iproute PATCH 1/6] utils: Implement strlcpy() and strlcat()
Quoted 28 lines · On Mon, 4 Sep 2017 17:00:15 +0200 Phil Sutter <[email protected]> wrote:
Quoted 18 lines · David Laight
From: Phil Sutter
Quoted 4 lines
Sent: 01 September 2017 17:53
By making use ofstrncpy(), both implementations are really simple so there is no need to add libbsd as additional dependency....
lib/utils.c int get_real_family(int rtm_type, int rtm_family) · line 1249
Quoted 9 lines
lib/utils.c +9
-0+ +size_t strlcpy (char *dst,const char *src,size_t size) +{ +if (size) { +strncpy (dst, src, size -1 ); + dst[size -1 ] ='\0' ; + } +return strlen (src); +}Except that isn't really
strlcpy().
Better would be:Quoted 8 lines
len = strlen(src) + 1; if (len <= size) memcpy(dst, src, len); else if (size) { dst[size - 1] = 0; memcpy(dst, src, size - 1); } return len - 1;
Quoted 4 lines
Please elaborate: Why isn't my version "really"
strlcpy()? Why is your proposed version better?Thanks, Phil
Linux kernel:size_t strlcpy(char *dest, const char *src, size_t size)
{
size_t ret = strlen(src);
if (size) {
size_t len = (ret >= size) ? size - 1 : ret;
memcpy(dest, src, len);
dest[len] = '\0';
}
return ret;
}FreeBSD:size_tstrlcpy(char * __restrict dst, const char * __restrict src, size_t dsize)
{
const char *osrc = src;
size_t nleft = dsize;
/* Copy as many bytes as will fit. */
if (nleft != 0) {
while (--nleft != 0) {
if ((*dst++ = *src++) == '\0')
break;
}
}
/* Not enough room in dst, add NUL and traverse rest of src. */
if (nleft == 0) {
if (dsize != 0)
*dst = '\0'; /* NUL-terminate dst */
while (*src++)
;
}
return(src - osrc - 1); /* count does not include NUL */
}They all give the same results for some basic tests.
Test FreeBSD Linux Iproute2
"",0: 0 "JUNK" 0 "JUNK" 0 "JUNK" "",1: 0 "" 0 "" 0 "" "",8: 0 "" 0 "" 0 "" "foo",0: 3 "JUNK" 3 "JUNK" 3 "JUNK" "foo",3: 3 "fo" 3 "fo" 3 "fo" "foo",4: 3 "foo" 3 "foo" 3 "foo" "foo",8: 3 "foo" 3 "foo" 3 "foo" "longstring",0: 10 "JUNK" 10 "JUNK" 10 "JUNK" "longstring",8: 10 "longstr" 10 "longstr" 10 "longstr"
RE: [iproute PATCH 1/6] utils: Implement strlcpy() and strlcat()
From: Stephen Hemminger [mailto:[email protected]]
Quoted 79 lines
Sent: 04 September 2017 19:25
Quoted 28 lines · On Mon, 4 Sep 2017 17:00:15 +0200 Phil Sutter <[email protected]> wrote:
Quoted 18 lines · David Laight
From: Phil Sutter
Quoted 4 lines
Sent: 01 September 2017 17:53
By making use ofstrncpy(), both implementations are really simple so there is no need to add libbsd as additional dependency....
lib/utils.c int get_real_family(int rtm_type, int rtm_family) · line 1249
Quoted 9 lines
lib/utils.c +9
-0+ +size_t strlcpy (char *dst,const char *src,size_t size) +{ +if (size) { +strncpy (dst, src, size -1 ); + dst[size -1 ] ='\0' ; + } +return strlen (src); +}Except that isn't really
strlcpy().
Better would be:Quoted 8 lines
len = strlen(src) + 1; if (len <= size) memcpy(dst, src, len); else if (size) { dst[size - 1] = 0; memcpy(dst, src, size - 1); } return len - 1;Quoted 4 lines
Please elaborate: Why isn't my version "really"
strlcpy()? Why is your proposed version better?Thanks, Phil
Linux kernel:
size_tstrlcpy(char *dest, const char *src, size_t size){ size_t ret = strlen(src); if (size) { size_t len = (ret >= size) ? size - 1 : ret; memcpy(dest, src, len); dest[len] = '\0'; } return ret; }FreeBSD:
size_tstrlcpy(char * __restrict dst, const char * __restrict src, size_t dsize){ const char *osrc = src; size_t nleft = dsize; /* Copy as many bytes as will fit. */ if (nleft != 0) { while (--nleft != 0) { if ((*dst++ = *src++) == '\0') break; } } /* Not enough room in dst, add NUL and traverse rest of src. */ if (nleft == 0) { if (dsize != 0) *dst = '\0'; /* NUL-terminate dst */ while (*src++) ; } return(src - osrc - 1); /* count does not include NUL */ }They all give the same results for some basic tests.
Test FreeBSD Linux Iproute2
Quoted 9 lines
"",0: 0 "JUNK" 0 "JUNK" 0 "JUNK" "",1: 0 "" 0 "" 0 "" "",8: 0 "" 0 "" 0 "" "foo",0: 3 "JUNK" 3 "JUNK" 3 "JUNK" "foo",3: 3 "fo" 3 "fo" 3 "fo" "foo",4: 3 "foo" 3 "foo" 3 "foo" "foo",8: 3 "foo" 3 "foo" 3 "foo" "longstring",0: 10 "JUNK" 10 "JUNK" 10 "JUNK" "longstring",8: 10 "longstr" 10 "longstr" 10 "longstr"
You need to look at the contents of the destination buffer after the first '\0'.strlcpy() shouldn't change it.
David
Re: [iproute PATCH 1/6] utils: Implement strlcpy() and strlcat()
Quoted 90 lines · On Wed, 6 Sep 2017 13:59:27 +0000 David Laight <[email protected]> wrote:
From: Stephen Hemminger [mailto:[email protected]]
Quoted 79 lines
Sent: 04 September 2017 19:25
Quoted 28 lines · On Mon, 4 Sep 2017 17:00:15 +0200 Phil Sutter <[email protected]> wrote:
Quoted 18 lines · David Laight
From: Phil Sutter
Quoted 4 lines
Sent: 01 September 2017 17:53
By making use ofstrncpy(), both implementations are really simple so there is no need to add libbsd as additional dependency....
lib/utils.c int get_real_family(int rtm_type, int rtm_family) · line 1249
Quoted 9 lines
lib/utils.c +9
-0+ +size_t strlcpy (char *dst,const char *src,size_t size) +{ +if (size) { +strncpy (dst, src, size -1 ); + dst[size -1 ] ='\0' ; + } +return strlen (src); +}Except that isn't really
strlcpy().
Better would be:Quoted 8 lines
len = strlen(src) + 1; if (len <= size) memcpy(dst, src, len); else if (size) { dst[size - 1] = 0; memcpy(dst, src, size - 1); } return len - 1;Quoted 4 lines
Please elaborate: Why isn't my version "really"
strlcpy()? Why is your proposed version better?Thanks, Phil
Linux kernel:
size_tstrlcpy(char *dest, const char *src, size_t size){ size_t ret = strlen(src); if (size) { size_t len = (ret >= size) ? size - 1 : ret; memcpy(dest, src, len); dest[len] = '\0'; } return ret; }FreeBSD:
size_tstrlcpy(char * __restrict dst, const char * __restrict src, size_t dsize){ const char *osrc = src; size_t nleft = dsize; /* Copy as many bytes as will fit. */ if (nleft != 0) { while (--nleft != 0) { if ((*dst++ = *src++) == '\0') break; } } /* Not enough room in dst, add NUL and traverse rest of src. */ if (nleft == 0) { if (dsize != 0) *dst = '\0'; /* NUL-terminate dst */ while (*src++) ; } return(src - osrc - 1); /* count does not include NUL */ }They all give the same results for some basic tests.
Test FreeBSD Linux Iproute2Quoted 9 lines
"",0: 0 "JUNK" 0 "JUNK" 0 "JUNK" "",1: 0 "" 0 "" 0 "" "",8: 0 "" 0 "" 0 "" "foo",0: 3 "JUNK" 3 "JUNK" 3 "JUNK" "foo",3: 3 "fo" 3 "fo" 3 "fo" "foo",4: 3 "foo" 3 "foo" 3 "foo" "foo",8: 3 "foo" 3 "foo" 3 "foo" "longstring",0: 10 "JUNK" 10 "JUNK" 10 "JUNK" "longstring",8: 10 "longstr" 10 "longstr" 10 "longstr"
Quoted 5 lines
You need to look at the contents of the destination buffer after the first '\0'.
strlcpy()shouldn't change it.David
Zeroing the bytes after the first null character should not be a big issue other than a few nanoseconds extra work.
PATCH 1/1 utils: Review strlcpy() and strlcat()
In reply to David LaightAs David Laight correctly pointed out, the first version of strlcpy() modified dst buffer behind the string copied into it. Fix this by writing NUL to the byte immediately following src string instead of to the last byte in dst. Doing so also allows to reduce overhead by using memcpy().
Improve strlcat() by avoiding the call to strlcpy() if dst string is already full, not just as sanity check.
--- lib/utils.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
lib/utils.c +8 -4
@@ -1233,18 +1233,22 @@ int get_real_family(int rtm_type, int rtm_family)size_t strlcpy (char *dst,const char *src,size_t size) { +size_t srclen =strlen (src); +if (size) { -strncpy (dst, src, size -1 ); - dst[size -1 ] ='\0' ; +size_t minlen =min (srclen, size -1 ); + +memcpy (dst, src, minlen); + dst[minlen] ='\0' ; } -return strlen (src); +return srclen; }size_t strlcat (char *dst,const char *src,size_t size) {size_t dlen =strlen (dst); -if (dlen > size) +if (dlen >= size)return dlen +strlen (src);return dlen +strlcpy (dst + dlen, src, size - dlen);
Signature · 1 line
2.13.1
PATCH 2/6 Convert the obvious cases to strlcpy()
In reply to Phil SutterThis converts the typical idiom of manually terminating the buffer after a call to strncpy().
--- ip/ipnetns.c | 3 +-- ip/iproute_lwtunnel.c | 3 +-- ip/ipvrf.c | 3 +-- lib/bpf.c | 3 +-- lib/fs.c | 3 +-- lib/inet_proto.c | 3 +-- misc/ss.c | 3 +-- tc/em_ipset.c | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-)
ip/ipnetns.c +1 -2
@@ -518,8 +518,7 @@ int netns_identify_pid(const char *pidstr, char *name, int len)if ((st.st_dev == netst.st_dev) && (st.st_ino == netst.st_ino)) { -strncpy (name, entry->d_name, len -1 ); - name[len -1 ] ='\0' ; +strlcpy (name, entry->d_name, len); } }closedir (dir);
ip/iproute_lwtunnel.c +1 -2
@@ -325,8 +325,7 @@ static int parse_encap_seg6(struct rtattr *rta, size_t len, int *argcp,invarg ("\"segs\" provided before \"mode\"\n" , *argv); -strncpy (segbuf, *argv,1024 ); - segbuf[1023 ] =0 ; +strlcpy (segbuf, *argv,1024 ); }else if (strcmp (*argv,"hmac" ) ==0 ) {NEXT_ARG ();if (hmac_ok++)
ip/ipvrf.c +1 -2
@@ -336,8 +336,7 @@ static int vrf_path(char *vpath, size_t len)if (vrf) *vrf ='\0' ; -strncpy (vpath, start, len -1 ); - vpath[len -1 ] ='\0' ; +strlcpy (vpath, start, len);/* if vrf path is just / then return nothing */ if (!strcmp (vpath,"/" ))
lib/bpf.c +1 -2
@@ -512,8 +512,7 @@ static const char *bpf_find_mntpt_single(unsigned long magic, char *mnt, ret =bpf_valid_mntpt (mntpt, magic);if (!ret) { -strncpy (mnt, mntpt, len -1 ); - mnt[len -1 ] =0 ; +strlcpy (mnt, mntpt, len);return mnt; }
lib/fs.c +1 -2
@@ -172,8 +172,7 @@ int get_command_name(const char *pid, char *comm, size_t len)if (nl) *nl ='\0' ; -strncpy (comm, name, len -1 ); - comm[len -1 ] ='\0' ; +strlcpy (comm, name, len);break ; }
lib/inet_proto.c +1 -2
@@ -38,8 +38,7 @@ const char *inet_proto_n2a(int proto, char *buf, int len)free (ncache); icache = proto; ncache =strdup (pe->p_name); -strncpy (buf, pe->p_name, len -1 ); - buf[len -1 ] ='\0' ; +strlcpy (buf, pe->p_name, len);return buf; }snprintf (buf, len,"ipproto-%d" , proto);
misc/ss.c +1 -2
@@ -425,8 +425,7 @@ static void user_ent_hash_build(void) user_ent_hash_build_init =1 ; -strncpy (name, root,sizeof (name)-1 ); - name[sizeof (name)-1 ] =0 ; +strlcpy (name, root,sizeof (name));if (strlen (name) ==0 || name[strlen (name)-1 ] !='/' )strcat (name,"/" );
tc/em_ipset.c +1 -2
@@ -145,8 +145,7 @@ get_set_byname(const char *setname, struct xt_set_info *info)int res; req.op =IP_SET_OP_GET_BYNAME ; -strncpy (req.set.name, setname,IPSET_MAXNAMELEN ); - req.set.name[IPSET_MAXNAMELEN -1 ] ='\0' ; +strlcpy (req.set.name, setname,IPSET_MAXNAMELEN ); res =do_getsockopt (&req);if (res !=0 )return -1 ;
Signature · 1 line
2.13.1
Re: [iproute PATCH 2/6] Convert the obvious cases to strlcpy()
Quoted 4 lines · Phil Sutter
This converts the typical idiom of manually terminating the buffer after a call to
strncpy().Signed-off-by Phil Sutter <[email protected]>
For BPF loader bits:
PATCH 3/6 Convert harmful calls to strncpy() to strlcpy()
In reply to Phil SutterThis patch converts spots where manual buffer termination was missing to strlcpy() since that does what is needed.
--- genl/ctrl.c | 2 +- ip/ipvrf.c | 2 +- ip/xfrm_state.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
genl/ctrl.c +1 -1
@@ -313,7 +313,7 @@ static int ctrl_list(int cmd, int argc, char **argv)if (matches (*argv,"name" ) ==0 ) {NEXT_ARG (); -strncpy (d, *argv,sizeof (d) -1 ); +strlcpy (d, *argv,sizeof (d));addattr_l (nlh,128 ,CTRL_ATTR_FAMILY_NAME , d,strlen (d) +1 ); }else if (matches (*argv,"id" ) ==0 ) {
ip/ipvrf.c +1 -1
@@ -74,7 +74,7 @@ static int vrf_identify(pid_t pid, char *name, size_t len)if (end) *end ='\0' ; -strncpy (name, vrf, len -1 ); +strlcpy (name, vrf, len);break ; } }
ip/xfrm_state.c +1 -1
@@ -125,7 +125,7 @@ static int xfrm_algo_parse(struct xfrm_algo *alg, enum xfrm_attr_type_t type,fprintf (stderr,"warning: ALGO-NAME/ALGO-KEYMAT values will be sent to the kernel promiscuously! (verifying them isn't implemented yet)\n" );#endif -strncpy (alg->alg_name, name,sizeof (alg->alg_name)); +strlcpy (alg->alg_name, name,sizeof (alg->alg_name));if (slen >2 &&strncmp (key,"0x" ,2 ) ==0 ) {/* split two chars "0x" from the top */
Signature · 1 line
2.13.1
PATCH 4/6 ipxfrm: Replace STRBUF_CAT macro with strlcat()
In reply to Phil Sutter--- ip/ipxfrm.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)
ip/ipxfrm.c +5 -16
@@ -40,17 +40,6 @@#include "ip_common.h" #define STRBUF_SIZE (128) -#define STRBUF_CAT (buf, str) \ - do { \ - int rest = sizeof(buf) - 1 - strlen(buf); \ - if (rest > 0) { \ - int len = strlen(str); \ - if (len > rest) \ - len = rest; \ - strncat(buf, str, len); \ - buf[sizeof(buf) - 1] = '\0'; \ - } \ - } while (0);struct xfrm_filter filter;
@@ -902,8 +891,8 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo, prefix, title);if (prefix) -STRBUF_CAT (buf, prefix); -STRBUF_CAT (buf,"\t" ); +strlcat (buf, prefix,sizeof (buf)); +strlcat (buf,"\t" ,sizeof (buf));fputs (buf, fp);fprintf (fp,"replay-window %u " , xsinfo->replay_window);
@@ -944,7 +933,7 @@ void xfrm_state_info_print(struct xfrm_usersa_info *xsinfo,char sbuf[STRBUF_SIZE ];memcpy (sbuf, buf,sizeof (sbuf)); -STRBUF_CAT (sbuf,"sel " ); +strlcat (sbuf,"sel " ,sizeof (sbuf));xfrm_selector_print (&xsinfo->sel, xsinfo->family, fp, sbuf); }
@@ -992,8 +981,8 @@ void xfrm_policy_info_print(struct xfrm_userpolicy_info *xpinfo, }if (prefix) -STRBUF_CAT (buf, prefix); -STRBUF_CAT (buf,"\t" ); +strlcat (buf, prefix,sizeof (buf)); +strlcat (buf,"\t" ,sizeof (buf));fputs (buf, fp);if (xpinfo->dir >=XFRM_POLICY_MAX ) {
Signature · 1 line
2.13.1
PATCH 5/6 tc_util: No need to terminate an snprintf'ed buffer
In reply to Phil Suttersnprintf() won't leave the buffer unterminated, so manually terminating is not necessary here.
--- tc/tc_util.c | 1 - 1 file changed, 1 deletion(-)
tc/tc_util.c +0 -1
@@ -434,7 +434,6 @@ static const char *action_n2a(int action)return "trap" ;default :snprintf (buf,64 ,"%d" , action); - buf[63 ] ='\0' ;return buf; } }
Signature · 1 line
2.13.1
PATCH 6/6 lnstat_util: Make sure buffer is NUL-terminated
In reply to Phil SutterCan't use strlcpy() here since lnstat is not linked against libutil.
While being at it, fix coding style in that chunk as well.
--- misc/lnstat_util.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
misc/lnstat_util.c +2 -1
@@ -150,7 +150,8 @@ static int lnstat_scan_compat_rtstat_fields(struct lnstat_file *lf) {char buf[FGETS_BUF_SIZE ]; -strncpy (buf,RTSTAT_COMPAT_LINE ,sizeof (buf)-1 ); +strncpy (buf,RTSTAT_COMPAT_LINE ,sizeof (buf) -1 ); + buf[sizeof (buf) -1 ] ='\0' ;return __lnstat_scan_fields (lf, buf); }
Signature · 1 line
2.13.1
Stephen Hemminger
AppliedQuoted 19 lines · On Fri, 1 Sep 2017 18:52:50 +0200 Phil Sutter <[email protected]> wrote:
The following series adds my own implementations of
strlcpy()andstrlcat()in patch 1 and changes the code to make use of them in the following patches but the last two: Patch 5 just eliminates a line of useless code I found while searching for potential users of the introduced functions, patch 6 sanitizes a call tostrncpy()inmisc/lnstat_util.cwithout usingstrlcpy()since lnstat is not being linked against libutil.I implemented both functions solely based on information in libbsd's man pages, so they are safe to be released under the GPL.
Phil Sutter (6):
utils: Implementstrlcpy()andstrlcat()Convert the obvious cases tostrlcpy()Convert harmful calls tostrncpy()tostrlcpy()
ipxfrm: ReplaceSTRBUF_CATmacro withstrlcat()
tc_util: No need to terminate an snprintf'ed buffer
lnstat_util: Make sure buffer is NUL-terminated
Quoted 17 lines
genl/ctrl.c | 2 +- include/utils.h | 3 +++ ip/ipnetns.c | 3 +-- ip/iproute_lwtunnel.c | 3 +-- ip/ipvrf.c | 5 ++--- ip/ipxfrm.c | 21 +++++---------------- ip/xfrm_state.c | 2 +- lib/bpf.c | 3 +-- lib/fs.c | 3 +-- lib/inet_proto.c | 3 +-- lib/utils.c | 19 +++++++++++++++++++ misc/lnstat_util.c | 3 ++- misc/ss.c | 3 +-- tc/em_ipset.c | 3 +-- tc/tc_util.c | 1 - 15 files changed, 40 insertions(+), 37 deletions(-)
Applied, thanks.