From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Cc: j@w1.fi, David Ahern <dsahern@gmail.com>,
Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH net 1/2] netlink: add NLA_U8_BUGGY attribute type
Date: Sat, 2 Dec 2017 21:23:31 +0100 [thread overview]
Message-ID: <20171202202332.10205-1-johannes@sipsolutions.net> (raw)
From: Johannes Berg <johannes.berg@intel.com>
This netlink type is used only for backwards compatibility
with broken userspace that used the wrong size for a given
u8 attribute, which is now rejected. It would've been wrong
before already, since on big endian the wrong value (always
zero) would be used by the kernel, but we can't break the
existing deployed userspace - hostapd for example now fails
to initialize entirely.
We could try to fix up the big endian problem here, but we
don't know *how* userspace misbehaved - if using nla_put_u32
then we could, but we also found a debug tool (which we'll
ignore for the purposes of this regression) that was putting
the padding into the length.
Fixes: 28033ae4e0f5 ("net: netlink: Update attr validation to require exact length for some types")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
include/net/netlink.h | 1 +
lib/nlattr.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 0c154f98e987..448a9b86c959 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -180,6 +180,7 @@ enum {
NLA_S32,
NLA_S64,
NLA_BITFIELD32,
+ NLA_U8_BUGGY, /* don't use this - only for bug-ward compatibility */
__NLA_TYPE_MAX,
};
diff --git a/lib/nlattr.c b/lib/nlattr.c
index 8bf78b4b78f0..2b89d25d4745 100644
--- a/lib/nlattr.c
+++ b/lib/nlattr.c
@@ -28,6 +28,7 @@ static const u8 nla_attr_len[NLA_TYPE_MAX+1] = {
};
static const u8 nla_attr_minlen[NLA_TYPE_MAX+1] = {
+ [NLA_U8_BUGGY] = sizeof(u8),
[NLA_MSECS] = sizeof(u64),
[NLA_NESTED] = NLA_HDRLEN,
};
--
2.14.2
next reply other threads:[~2017-12-02 20:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-02 20:23 Johannes Berg [this message]
2017-12-02 20:23 ` [PATCH net 2/2] nl80211: use NLA_U8_BUGGY for two attributes Johannes Berg
2017-12-02 22:48 ` [PATCH net 1/2] netlink: add NLA_U8_BUGGY attribute type David Ahern
2017-12-05 16:31 ` David Miller
2017-12-05 16:34 ` Johannes Berg
2017-12-05 16:41 ` David Miller
2017-12-05 17:30 ` Johannes Berg
2017-12-05 17:40 ` David Miller
2017-12-05 18:15 ` David Ahern
2017-12-05 19:08 ` David Miller
2017-12-05 16:41 ` David Ahern
2017-12-05 16:51 ` David Miller
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=20171202202332.10205-1-johannes@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=dsahern@gmail.com \
--cc=j@w1.fi \
--cc=johannes.berg@intel.com \
--cc=linux-wireless@vger.kernel.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