netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Phil Sutter <phil@nwl.cc>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: netdev@vger.kernel.org
Subject: [iproute PATCH v2 7/7] lib/libnetlink: Don't pass NULL parameter to memcpy()
Date: Mon, 21 Aug 2017 19:08:13 +0200	[thread overview]
Message-ID: <20170821170813.29697-8-phil@nwl.cc> (raw)
In-Reply-To: <20170821170813.29697-1-phil@nwl.cc>

Both addattr_l() and rta_addattr_l() may be called with NULL data
pointer and 0 alen parameters. Avoid calling memcpy() in that case.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 lib/libnetlink.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 874e660be7eb4..fbe719ee10449 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -871,7 +871,8 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
 	rta = NLMSG_TAIL(n);
 	rta->rta_type = type;
 	rta->rta_len = len;
-	memcpy(RTA_DATA(rta), data, alen);
+	if (alen)
+		memcpy(RTA_DATA(rta), data, alen);
 	n->nlmsg_len = NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len);
 	return 0;
 }
@@ -958,7 +959,8 @@ int rta_addattr_l(struct rtattr *rta, int maxlen, int type,
 	subrta = (struct rtattr *)(((char *)rta) + RTA_ALIGN(rta->rta_len));
 	subrta->rta_type = type;
 	subrta->rta_len = len;
-	memcpy(RTA_DATA(subrta), data, alen);
+	if (alen)
+		memcpy(RTA_DATA(subrta), data, alen);
 	rta->rta_len = NLMSG_ALIGN(rta->rta_len) + RTA_ALIGN(len);
 	return 0;
 }
-- 
2.13.1

      parent reply	other threads:[~2017-08-21 17:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-21 17:08 [iproute PATCH v2 0/7] Covscan: Misc fixes Phil Sutter
2017-08-21 17:08 ` [iproute PATCH v2 1/7] nstat: Avoid passing negative fd to fdopen() Phil Sutter
2017-08-22  0:23   ` Stephen Hemminger
2017-08-22 10:48     ` Phil Sutter
2017-08-21 17:08 ` [iproute PATCH v2 2/7] ss: Make sure index variable is >= 0 Phil Sutter
2017-08-22  0:34   ` Stephen Hemminger
2017-08-21 17:08 ` [iproute PATCH v2 3/7] ss: Make sure scanned index value to unix_state_map is sane Phil Sutter
2017-08-21 17:08 ` [iproute PATCH v2 4/7] netem/maketable: Check return value of fscanf() Phil Sutter
2017-08-21 17:08 ` [iproute PATCH v2 5/7] lib/bpf: Check return value of write() Phil Sutter
2017-08-21 17:08 ` [iproute PATCH v2 6/7] lib/fs: Fix and simplify make_path() Phil Sutter
2017-08-21 17:08 ` Phil Sutter [this message]

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=20170821170813.29697-8-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).