From: Phil Sutter <phil@nwl.cc>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: netdev@vger.kernel.org
Subject: [iproute PATCH v3 5/7] lnstat_util: Simplify alloc_and_open() a bit
Date: Mon, 21 Aug 2017 15:23:39 +0200 [thread overview]
Message-ID: <20170821132341.23118-6-phil@nwl.cc> (raw)
In-Reply-To: <20170821132341.23118-1-phil@nwl.cc>
Relying upon callers and using unsafe strcpy() is probably not the best
idea. Aside from that, using snprintf() allows to format the string for
lf->path in one go.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
misc/lnstat_util.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/misc/lnstat_util.c b/misc/lnstat_util.c
index cc54598fe1bef..ec19238c24b94 100644
--- a/misc/lnstat_util.c
+++ b/misc/lnstat_util.c
@@ -180,11 +180,8 @@ static struct lnstat_file *alloc_and_open(const char *path, const char *file)
}
/* initialize */
- /* de->d_name is guaranteed to be <= NAME_MAX */
- strcpy(lf->basename, file);
- strcpy(lf->path, path);
- strcat(lf->path, "/");
- strcat(lf->path, lf->basename);
+ snprintf(lf->basename, sizeof(lf->basename), "%s", file);
+ snprintf(lf->path, sizeof(lf->path), "%s/%s", path, file);
/* initialize to default */
lf->interval.tv_sec = 1;
--
2.13.1
next prev parent reply other threads:[~2017-08-21 13:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-21 13:23 [iproute PATCH v3 0/7] Covscan: Fixes for string termination Phil Sutter
2017-08-21 13:23 ` [iproute PATCH v3 1/7] ipntable: Avoid memory allocation for filter.name Phil Sutter
2017-08-21 13:23 ` [iproute PATCH v3 2/7] xfrm_state: Make sure alg_name is NULL-terminated Phil Sutter
2017-08-22 0:28 ` Stephen Hemminger
2017-08-22 11:05 ` Phil Sutter
2017-08-21 13:23 ` [iproute PATCH v3 3/7] lib/fs: Fix format string in find_fs_mount() Phil Sutter
2017-08-21 13:23 ` [iproute PATCH v3 4/7] lib/inet_proto: Review inet_proto_{a2n,n2a}() Phil Sutter
2017-08-21 13:23 ` Phil Sutter [this message]
2017-08-21 13:23 ` [iproute PATCH v3 6/7] tc/m_xt: Fix for potential string buffer overflows Phil Sutter
2017-08-21 13:23 ` [iproute PATCH v3 7/7] lib/ll_map: Choose size of new cache items at run-time Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170821132341.23118-6-phil@nwl.cc \
--to=phil@nwl.cc \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).