From: Harsha Sharma <harshasharmaiitr@gmail.com>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org,
outreachy-kernel@googlegroups.com,
Harsha Sharma <harshasharmaiitr@gmail.com>
Subject: [PATCH] src: buffer is not null terminated
Date: Mon, 9 Oct 2017 00:28:25 +0530 [thread overview]
Message-ID: <20171008185825.21202-1-harshasharmaiitr@gmail.com> (raw)
Use snprintf() over strncpy() functions as the buffer is not null
terminated in strncpy().
Signed-off-by: Harsha Sharma <harshasharmaiitr@gmail.com>
---
src/datatype.c | 2 +-
src/iface.c | 4 ++--
src/netlink.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/datatype.c b/src/datatype.c
index 94b1224..9439ea3 100644
--- a/src/datatype.c
+++ b/src/datatype.c
@@ -858,7 +858,7 @@ static uint32_t str2int(char *tmp, const char *c, int k)
if (k == 0)
return 0;
- strncpy(tmp, c-k, k+1);
+ snprintf(tmp, k+1, "%s", c-k);
return atoi(tmp);
}
diff --git a/src/iface.c b/src/iface.c
index 9936388..d0e1834 100644
--- a/src/iface.c
+++ b/src/iface.c
@@ -53,7 +53,7 @@ static int data_cb(const struct nlmsghdr *nlh, void *data)
iface = xmalloc(sizeof(struct iface));
iface->ifindex = ifm->ifi_index;
mnl_attr_parse(nlh, sizeof(*ifm), data_attr_cb, tb);
- strncpy(iface->name, mnl_attr_get_str(tb[IFLA_IFNAME]), IFNAMSIZ);
+ snprintf(iface->name, IFNAMSIZ, "%s", mnl_attr_get_str(tb[IFLA_IFNAME]));
list_add(&iface->list, &iface_list);
return MNL_CB_OK;
@@ -139,7 +139,7 @@ char *nft_if_indextoname(unsigned int ifindex, char *name)
list_for_each_entry(iface, &iface_list, list) {
if (iface->ifindex == ifindex) {
- strncpy(name, iface->name, IFNAMSIZ);
+ snprintf(name, IFNAMSIZ, "%s", iface->name);
return name;
}
}
diff --git a/src/netlink.c b/src/netlink.c
index d5d410a..f69a5b9 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -386,7 +386,7 @@ static void netlink_gen_verdict(const struct expr *expr,
switch (expr->verdict) {
case NFT_JUMP:
case NFT_GOTO:
- strncpy(data->chain, expr->chain, NFT_CHAIN_MAXNAMELEN);
+ snprintf(data->chain, NFT_CHAIN_MAXNAMELEN, "%s", expr->chain);
data->chain[NFT_CHAIN_MAXNAMELEN-1] = '\0';
break;
}
@@ -2915,7 +2915,7 @@ static int netlink_events_newgen_cb(const struct nlmsghdr *nlh, int type,
case NFTA_GEN_PROC_NAME:
if (mnl_attr_validate(attr, MNL_TYPE_NUL_STRING) < 0)
break;
- strncpy(name, mnl_attr_get_str(attr), sizeof(name));
+ snprintf(name, sizeof(name), "%s", mnl_attr_get_str(attr));
break;
case NFTA_GEN_PROC_ID:
if (mnl_attr_validate(attr, MNL_TYPE_U32) < 0)
--
2.11.0
next reply other threads:[~2017-10-08 19:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-08 18:58 Harsha Sharma [this message]
2017-10-08 19:06 ` [Outreachy kernel] [PATCH] src: buffer is not null terminated Julia Lawall
2017-10-08 19:28 ` Harsha Sharma
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=20171008185825.21202-1-harshasharmaiitr@gmail.com \
--to=harshasharmaiitr@gmail.com \
--cc=netfilter-devel@vger.kernel.org \
--cc=outreachy-kernel@googlegroups.com \
--cc=pablo@netfilter.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).