| Message ID | 20130805152554.GA3592@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: "Michael S. Tsirkin" <mst@redhat.com> Date: Mon, 5 Aug 2013 18:25:54 +0300 > commit df8ef8f3aaa6692970a436204c4429210addb23a > macvlan: add FDB bridge ops and macvlan flags > added a flags field to macvlan, which can be > controlled from userspace. > The idea is to make the interface future-proof > so we can add flags and not new fields. > > However, flags value isn't validated, as a result, > userspace can't detect which flags are supported. > > Cc: "David S. Miller" <davem@davemloft.net> > Cc: John Fastabend <john.r.fastabend@intel.com> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Applied and queued up for -stable, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 18373b6..8445a94 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -736,6 +736,10 @@ static int macvlan_validate(struct nlattr *tb[], struct nlattr *data[]) return -EADDRNOTAVAIL; } + if (data && data[IFLA_MACVLAN_FLAGS] && + nla_get_u16(data[IFLA_MACVLAN_FLAGS]) & ~MACVLAN_FLAG_NOPROMISC) + return -EINVAL; + if (data && data[IFLA_MACVLAN_MODE]) { switch (nla_get_u32(data[IFLA_MACVLAN_MODE])) { case MACVLAN_MODE_PRIVATE:
commit df8ef8f3aaa6692970a436204c4429210addb23a macvlan: add FDB bridge ops and macvlan flags added a flags field to macvlan, which can be controlled from userspace. The idea is to make the interface future-proof so we can add flags and not new fields. However, flags value isn't validated, as a result, userspace can't detect which flags are supported. Cc: "David S. Miller" <davem@davemloft.net> Cc: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- Changes from v2: drop chunk in macvlan_common_newlink - not necessary since macvlan_validate is always called first Changes from v1: tweaked commit message no code changes Please consider this patch for -stable. The idea is by the time we add more flags, everyone has updated to a kernel that detects errors, so userspace will be able to detect supported flags cleanly. drivers/net/macvlan.c | 4 ++++ 1 file changed, 4 insertions(+)