diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 17:46:10 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 17:46:10 -0800 |
| commit | 54640cfe47251cd8acd7145ff86bcaf4db0e9616 (patch) | |
| tree | 8bfe98c0f56a9447c2514d89eaf742e88acdd0a2 /net | |
| parent | 5edfa05a10a7a545f085b5bdf1a79567b4470d4e (diff) | |
| parent | 702c0ce9a7c7ad1b22883aa82d8c29eaa6e65aab (diff) | |
Merge tag 'v4.4.49' into android-4.4.y
This is the 4.4.49 stable release
Diffstat (limited to 'net')
| -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 f7bb6829b415..9063e8e736ad 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -355,7 +355,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) |