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 v4 6/6] lib/ll_map: Choose size of new cache items at run-time
Date: Thu, 24 Aug 2017 11:51:50 +0200	[thread overview]
Message-ID: <20170824095150.5469-7-phil@nwl.cc> (raw)
In-Reply-To: <20170824095150.5469-1-phil@nwl.cc>

Instead of having a fixed buffer of 16 bytes for the interface name,
tailor size of new ll_cache entry using the interface name's actual
length. This also makes sure the following call to strcpy() is safe.

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

diff --git a/lib/ll_map.c b/lib/ll_map.c
index 4e4556c9ac80b..70684b02042b6 100644
--- a/lib/ll_map.c
+++ b/lib/ll_map.c
@@ -30,7 +30,7 @@ struct ll_cache {
 	unsigned	flags;
 	unsigned 	index;
 	unsigned short	type;
-	char		name[IFNAMSIZ];
+	char		name[];
 };
 
 #define IDXMAP_SIZE	1024
@@ -120,7 +120,7 @@ int ll_remember_index(const struct sockaddr_nl *who,
 		return 0;
 	}
 
-	im = malloc(sizeof(*im));
+	im = malloc(sizeof(*im) + strlen(ifname) + 1);
 	if (im == NULL)
 		return 0;
 	im->index = ifi->ifi_index;
-- 
2.13.1

  parent reply	other threads:[~2017-08-24  9:52 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-24  9:51 [iproute PATCH v4 0/6] Covscan: Fixes for string termination Phil Sutter
2017-08-24  9:51 ` [iproute PATCH v4 1/6] ipntable: Avoid memory allocation for filter.name Phil Sutter
2017-08-24  9:51 ` [iproute PATCH v4 2/6] lib/fs: Fix format string in find_fs_mount() Phil Sutter
2017-08-24  9:51 ` [iproute PATCH v4 3/6] lib/inet_proto: Review inet_proto_{a2n,n2a}() Phil Sutter
2017-08-24  9:51 ` [iproute PATCH v4 4/6] lnstat_util: Simplify alloc_and_open() a bit Phil Sutter
2017-08-24  9:51 ` [iproute PATCH v4 5/6] tc/m_xt: Fix for potential string buffer overflows Phil Sutter
2017-08-24  9:51 ` Phil Sutter [this message]
2017-08-24 22:16 ` [iproute PATCH v4 0/6] Covscan: Fixes for string termination Stephen Hemminger

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=20170824095150.5469-7-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).