X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=batman-adv%2Fpatches%2F0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch;fp=batman-adv%2Fpatches%2F0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch;h=cf80c50a2c9395ffb241b7ba88e88b5123b68d38;hb=dca9b7e0cab4feb9b29f7c2d4e8c61636160721a;hp=4fbdbad029bbb5461aedf4614bb19be677545b2a;hpb=f622ffd9bcfad8be64e716cbcbb656b6fc53694d;p=feed%2Frouting.git diff --git a/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch b/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch index 4fbdbad..cf80c50 100644 --- a/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch +++ b/batman-adv/patches/0003-batman-adv-Fix-double-free-during-fragment-merge-err.patch @@ -1,6 +1,6 @@ From: Sven Eckelmann Date: Sun, 12 Feb 2017 11:26:33 +0100 -Subject: [PATCH] batman-adv: Fix double free during fragment merge error +Subject: batman-adv: Fix double free during fragment merge error The function batadv_frag_skb_buffer was supposed not to consume the skbuff on errors. This was followed in the helper function @@ -19,9 +19,6 @@ Fixes: 9b3eab61754d ("batman-adv: Receive fragmented packets and merge") Signed-off-by: Sven Eckelmann Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/e3bab02816097f860545d9ce9ae0808c69d7c92f ---- - net/batman-adv/fragmentation.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 0854ebd8613e9bf9044b04099b11341325d6e194..31e97e9aee0d543b68be091936888e1f6c9dd7eb 100644