diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-23 12:10:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-23 12:10:12 +1000 |
| commit | 94000cc32988a0674923309d35ab9c2405c4b39b (patch) | |
| tree | ef9d58ea9ad614bfdf6d0c7c6293f05dbd989475 /net/mac80211/mesh.c | |
| parent | a5eb76d9c892b8bd7d3505f8897cf126a54860bd (diff) | |
| parent | 7089db84e356562f8ba737c29e472cc42d530dbc (diff) | |
Merge tag 'v4.10-rc8' into drm-next
Linux 4.10-rc8
Backmerge Linus rc8 to fix some conflicts, but also
to avoid pulling it in via a fixes pull from someone.
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 42120d965263..50e1b7f78bd4 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -339,7 +339,7 @@ int mesh_add_vendor_ies(struct ieee80211_sub_if_data *sdata, /* fast-forward to vendor IEs */ offset = ieee80211_ie_split_vendor(ifmsh->ie, ifmsh->ie_len, 0); - if (offset) { + if (offset < ifmsh->ie_len) { len = ifmsh->ie_len - offset; data = ifmsh->ie + offset; if (skb_tailroom(skb) < len) |