pull request net: batman-adv 2013-05-09
Message ID | 1368097007-817-1-git-send-email-ordex@autistici.org (mailing list archive) |
---|---|
State | Not Applicable, archived |
Headers |
Return-Path: <ordex@autistici.org> Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=82.94.249.234; helo=latitanza.investici.org; envelope-from=ordex@autistici.org; receiver=b.a.t.m.a.n@lists.open-mesh.org Received: from latitanza.investici.org (latitanza.investici.org [82.94.249.234]) by open-mesh.org (Postfix) with ESMTPS id A92B860038B for <b.a.t.m.a.n@lists.open-mesh.org>; Thu, 9 May 2013 12:58:32 +0200 (CEST) Received: from [82.94.249.234] (latitanza [82.94.249.234]) (Authenticated sender: ordex@autistici.org) by localhost (Postfix) with ESMTPSA id 310B9980CC; Thu, 9 May 2013 10:58:31 +0000 (UTC) X-DKIM: Sendmail DKIM Filter v2.8.2 latitanza.investici.org 310B9980CC From: Antonio Quartulli <ordex@autistici.org> To: davem@davemloft.net Date: Thu, 9 May 2013 12:56:43 +0200 Message-Id: <1368097007-817-1-git-send-email-ordex@autistici.org> X-Mailer: git-send-email 1.8.1.5 Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org Subject: [B.A.T.M.A.N.] pull request net: batman-adv 2013-05-09 X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> List-Id: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n.lists.open-mesh.org> List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe> List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n/> List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org> List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help> List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe> X-List-Received-Date: Thu, 09 May 2013 10:58:33 -0000 |
Pull-request
git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davemMessage
Antonio Quartulli
May 9, 2013, 10:56 a.m. UTC
here you have four fixes intended for net. 1/4 fixes the parsing of a string sent from userspace in order to avoid random memory access in case of string length of 0. 2/4 adds a check for the return value of pskb_trim_rcsum() in order to stop processing the skb in case of failure. 3/4 prevents DAT (the Distributed ARP Table) to send cached ARP replies when both the source and the destination of the snooped ARP request are local clients (meaning: directly connected to the node). This can confuse a bridge where batman-adv is enslaved. 4/4 fix a race condition in the main clean up procedure by reordering sub-components freeing function invocations. Please pull or let me know if there is any problem. Thanks a lot, Antonio The following changes since commit 4f924b2aa4d3cb30f07e57d6b608838edcbc0d88: if_cablemodem.h: Add parenthesis around ioctl macros (2013-05-08 13:13:30 -0700) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem for you to fetch changes up to a4361860351e87876aebd9595906d928ce8572c6: batman-adv: reorder clean up routine in order to avoid race conditions (2013-05-09 12:39:45 +0200) ---------------------------------------------------------------- Included changes: - fix parsing of user typed protocol string to avoid random memory access in some cases - check pskb_trim_rcsum() return value - prevent DAT from sending ARP replies when not needed - reorder the main clean up routine to prevent race conditions ---------------------------------------------------------------- Antonio Quartulli (2): batman-adv: make DAT drop ARP requests targeting local clients batman-adv: reorder clean up routine in order to avoid race conditions Marek Lindner (2): batman-adv: check proto length before accessing proto string buffer batman-adv: check return value of pskb_trim_rcsum() net/batman-adv/distributed-arp-table.c | 13 +++++++++++++ net/batman-adv/main.c | 18 +++++++++++++----- net/batman-adv/network-coding.c | 8 ++++++-- 3 files changed, 32 insertions(+), 7 deletions(-)
Comments
On Thu, May 09, 2013 at 12:56:43PM +0200, Antonio Quartulli wrote:
> here you have four fixes intended for net.
Ops, "Hello David," has been trimmed.
Sorry for that :)
Cheers,
From: Antonio Quartulli <ordex@autistici.org> Date: Thu, 9 May 2013 12:56:43 +0200 > here you have four fixes intended for net. > > 1/4 fixes the parsing of a string sent from userspace in order to avoid random > memory access in case of string length of 0. > > 2/4 adds a check for the return value of pskb_trim_rcsum() in order to stop > processing the skb in case of failure. > > 3/4 prevents DAT (the Distributed ARP Table) to send cached ARP replies when > both the source and the destination of the snooped ARP request are local clients > (meaning: directly connected to the node). This can confuse a bridge where > batman-adv is enslaved. > > 4/4 fix a race condition in the main clean up procedure by reordering > sub-components freeing function invocations. > > Please pull or let me know if there is any problem. Pulled, thanks Antonio.