Patchwork pull request net: batman-adv 2013-05-09

login
register
mail settings
Submitter Antonio Quartulli
Date May 9, 2013, 10:56 a.m.
Message ID <1368097007-817-1-git-send-email-ordex@autistici.org>
Download mbox
Permalink /patch/242753/
State Accepted
Delegated to: David Miller
Headers show

Pull-request

git://git.open-mesh.org/linux-merge.git tags/batman-adv-fix-for-davem

Comments

Antonio Quartulli - May 9, 2013, 10:56 a.m.
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(-)
--
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
Antonio Quartulli - May 9, 2013, 11:07 a.m.
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,
David Miller - May 11, 2013, 11:24 p.m.
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.
--
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