From: Antonio Quartulli <ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org
Subject: pull request net: batman-adv 2013-05-09
Date: Thu, 9 May 2013 12:56:43 +0200 [thread overview]
Message-ID: <1368097007-817-1-git-send-email-ordex@autistici.org> (raw)
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(-)
next reply other threads:[~2013-05-09 10:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-09 10:56 Antonio Quartulli [this message]
2013-05-09 10:56 ` [PATCH 1/4] batman-adv: check proto length before accessing proto string buffer Antonio Quartulli
2013-05-09 10:56 ` [PATCH 2/4] batman-adv: check return value of pskb_trim_rcsum() Antonio Quartulli
2013-05-09 10:56 ` [PATCH 3/4] batman-adv: make DAT drop ARP requests targeting local clients Antonio Quartulli
2013-05-09 10:56 ` [PATCH 4/4] batman-adv: reorder clean up routine in order to avoid race conditions Antonio Quartulli
2013-05-09 11:07 ` [B.A.T.M.A.N.] pull request net: batman-adv 2013-05-09 Antonio Quartulli
2013-05-11 23:24 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368097007-817-1-git-send-email-ordex@autistici.org \
--to=ordex-gaufno9rbhfsroww+9zijq@public.gmane.org \
--cc=b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).