From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: "David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
devel@driverdev.osuosl.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 1/4] lib/net_utils: Relax NULL-termination requirement on input string
Date: Tue, 19 Dec 2017 21:14:09 +0200 [thread overview]
Message-ID: <20171219191412.14880-1-andriy.shevchenko@linux.intel.com> (raw)
We have not been caring about garbage at the end of input string and this
change doesn't affect it. What we prevent here is possibility to go over
boundaries when input string is not NULL terminated at all.
Allow mac_pton() work on non-NULL terminated strings.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
lib/net_utils.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/net_utils.c b/lib/net_utils.c
index af525353395d..d32c6961fe0f 100644
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -4,12 +4,14 @@
#include <linux/ctype.h>
#include <linux/kernel.h>
+#define MAC_PTON_MINLEN (3 * ETH_ALEN - 1)
+
bool mac_pton(const char *s, u8 *mac)
{
int i;
/* XX:XX:XX:XX:XX:XX */
- if (strlen(s) < 3 * ETH_ALEN - 1)
+ if (strnlen(s, MAC_PTON_MINLEN) < MAC_PTON_MINLEN)
return false;
/* Don't dirty result unless string is valid MAC. */
--
2.15.1
next reply other threads:[~2017-12-19 19:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-19 19:14 Andy Shevchenko [this message]
2017-12-19 19:14 ` [PATCH v1 2/4] lib/net_utils: Introduce mac_pton_from_user() Andy Shevchenko
2017-12-20 7:13 ` Greg Kroah-Hartman
2017-12-20 15:51 ` David Miller
2017-12-19 19:14 ` [PATCH v1 3/4] staging: rtl8723bs: Replace mac address parsing Andy Shevchenko
2017-12-19 19:14 ` [PATCH v1 4/4] staging: rtl8712: " Andy Shevchenko
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=20171219191412.14880-1-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=Larry.Finger@lwfinger.net \
--cc=davem@davemloft.net \
--cc=devel@driverdev.osuosl.org \
--cc=florian.c.schilhabel@googlemail.com \
--cc=gregkh@linuxfoundation.org \
--cc=netdev@vger.kernel.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).