* Re: [PATCH] ipv6: unify logic evaluating inet6_dev's accept_ra property
From: David Miller @ 2012-11-30 17:09 UTC (permalink / raw)
To: shmulik.ladkani; +Cc: netdev, yoshfuji, tgraf, tore
In-Reply-To: <1354181179-16294-1-git-send-email-shmulik.ladkani@gmail.com>
From: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Date: Thu, 29 Nov 2012 11:26:19 +0200
> + /*
> + * If forwarding is enabled, RA are not accepted unless the special
> + * hybrid mode (accept_ra=2) is enabled.
> + */
Please format this comment correctly, in the networking we use
the style:
/* That looks
* like this.
*/
/*
* Not
* like this.
*/
Thanks.
^ permalink raw reply
* Re: [PATCH] mISDN: improve bitops usage
From: David Miller @ 2012-11-30 17:11 UTC (permalink / raw)
To: akinobu.mita; +Cc: netdev, isdn
In-Reply-To: <1354188465-29012-1-git-send-email-akinobu.mita@gmail.com>
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Thu, 29 Nov 2012 20:27:45 +0900
> This improves bitops usages in several points:
>
> - Convert u64 to a proper bitmap declaration. This enables to remove
> superfluous typecasting from 'u64' to 'unsigned long *'.
>
> - Convert superfluous atomic bitops to non atomic bitops. The bitmap
> is allocated on the stack and it is not accessed by any other threads,
> so using atomic bitops is not necessary.
>
> - Use find_next_zero_bit and find_next_zero_bit instead of calling
> test_bit() for each bit.
>
> Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: pull-request: can-next 2012-11-29
From: David Miller @ 2012-11-30 17:12 UTC (permalink / raw)
To: mkl; +Cc: netdev, linux-can
In-Reply-To: <50B76815.8010907@pengutronix.de>
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 29 Nov 2012 14:50:13 +0100
> this pull request is for net-next/master. There is a patch by Alexander
> Stein fixing a reference counter problem which can make driver
> unloading impossible (stable Cc'ed). And several patches by me which
> remove an obsolete mechanism from several drivers, which is already
> handled at the infrastructure level.
Applied thanks.
^ permalink raw reply
* Re: [PATCH v2 3/3] pppoatm: protect against freeing of vcc
From: chas williams - CONTRACTOR @ 2012-11-30 17:12 UTC (permalink / raw)
To: David Woodhouse
Cc: Krzysztof Mazur, David Laight, davem, netdev, linux-kernel,
nathan
In-Reply-To: <1354292626.21562.298.camel@shinybook.infradead.org>
On Fri, 30 Nov 2012 16:23:46 +0000
David Woodhouse <dwmw2@infradead.org> wrote:
> On Fri, 2012-11-30 at 12:10 +0000, David Woodhouse wrote:
> > In that case I think we're fine. I'll just do the same thing in
> > br2684_push(), fix up the comment you just corrected, and we're all
> > good.
>
> OK, here's an update to me my patch 8/17 'br2684: don't send frames on
> not-ready vcc'. It takes the socket lock and does fairly much the same
> thing as your pppoatm version. It returns NETDEV_TX_BUSY and stops the
> queue if the socket is locked, and it gets woken from the ->release_cb
> callback.
>
> I've dropped your Acked-By: since it's mostly new, but feel free to give
> me a fresh one. With this I think we're done.
>
> Unless Chas has any objections, I'll ask Dave to pull it...
no objections. i think this deals with my concerns. as for splitting
the close functions, from one of your previous messages:
>Really, what we're saying is that *one* of the driver or protocol close
>functions needs to be split, and we need to do DPD or PDP. Since the
>device driver *can* abort/flush the TX queue and also any pending RX
>being handled by a tasklet, I think it makes most sense to keep it in
>the middle, with the protocol being handled first and last... which is
>the current order, as long as we consider setting ATM_VF_CLOSE to be the
>first part.
i believe this is essentially already done with the release_cb()
implementation right? that is splitting the protocol detach/shutdown
into two parts.
^ permalink raw reply
* Re: [PATCH net-next v1 3/3] net/mlx4_en: Set number of rx/tx channels using ethtool
From: David Miller @ 2012-11-30 17:16 UTC (permalink / raw)
To: amirv; +Cc: ogerlitz, oren, netdev
In-Reply-To: <1354216903-830-4-git-send-email-amirv@mellanox.com>
From: Amir Vadai <amirv@mellanox.com>
Date: Thu, 29 Nov 2012 21:21:43 +0200
> +static void mlx4_en_get_channels(struct net_device *dev,
> + struct ethtool_channels *channel)
This is not formatted correctly, the argument on the second line
must line up with the first column after the openning "(" on the
previous line.
^ permalink raw reply
* Re: [PATCH v3 net-next 0/2] myri10ge: LRO to GRO conversion
From: David Miller @ 2012-11-30 17:17 UTC (permalink / raw)
To: gallatin; +Cc: netdev
In-Reply-To: <50B7CE83.1020809@myri.com>
From: Andrew Gallatin <gallatin@myri.com>
Date: Thu, 29 Nov 2012 16:07:15 -0500
>
> drivers/net/ethernet/myricom/Kconfig | 1 -
> drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 275
> ++++++----------------
> 2 files changed, 74 insertions(+), 202 deletions(-)
>
Your email client is chopping up long lines, corrupting your
patches.
^ permalink raw reply
* Re: [PATCH] 6lowpan: consider checksum bytes in fragmentation threshold
From: David Miller @ 2012-11-30 17:19 UTC (permalink / raw)
To: alan
Cc: alex.bluesman.smirnov, dbaryshkov, linux-zigbee-devel, netdev,
linux-kernel
In-Reply-To: <1354240544-22214-1-git-send-email-alan@signal11.us>
From: Alan Ott <alan@signal11.us>
Date: Thu, 29 Nov 2012 20:55:44 -0500
> Change the threshold for framentation of a lowpan packet from
> using the MTU size to now use the MTU size minus the checksum length,
> which is added by the hardware. For IEEE 802.15.4, this effectively
> changes it from 127 bytes to 125 bytes.
>
> Signed-off-by: Alan Ott <alan@signal11.us>
Applied.
^ permalink raw reply
* Re: [PATCH 1/2] mac802154: fix memory leaks
From: David Miller @ 2012-11-30 17:19 UTC (permalink / raw)
To: alan
Cc: alex.bluesman.smirnov, dbaryshkov, eric.dumazet,
linux-zigbee-devel, netdev, linux-kernel
In-Reply-To: <1354249511-8086-1-git-send-email-alan@signal11.us>
From: Alan Ott <alan@signal11.us>
Date: Thu, 29 Nov 2012 23:25:10 -0500
> kfree_skb() was not getting called in the case of some failures.
> This was pointed out by Eric Dumazet.
>
> Signed-off-by: Alan Ott <alan@signal11.us>
Applied.
^ permalink raw reply
* Re: [PATCH 2/2] mac802154: use kfree_skb() instead of dev_kfree_skb()
From: David Miller @ 2012-11-30 17:19 UTC (permalink / raw)
To: alan
Cc: alex.bluesman.smirnov, dbaryshkov, eric.dumazet,
linux-zigbee-devel, netdev, linux-kernel
In-Reply-To: <1354249511-8086-2-git-send-email-alan@signal11.us>
From: Alan Ott <alan@signal11.us>
Date: Thu, 29 Nov 2012 23:25:11 -0500
> kfree_skb() indicates failure, which is where this is being used.
>
> Signed-off-by: Alan Ott <alan@signal11.us>
Applied.
^ permalink raw reply
* Re: [PATCH] sctp: fix CONFIG_SCTP_DBG_MSG=y null pointer dereference in sctp_v6_get_dst()
From: David Miller @ 2012-11-30 17:21 UTC (permalink / raw)
To: tt.rantala; +Cc: linux-sctp, netdev, nhorman, vyasevich, sri, davej
In-Reply-To: <1354267062-15888-1-git-send-email-tt.rantala@gmail.com>
From: Tommi Rantala <tt.rantala@gmail.com>
Date: Fri, 30 Nov 2012 11:17:42 +0200
> Trinity (the syscall fuzzer) triggered the following BUG, reproducible
> only when the kernel is configured with CONFIG_SCTP_DBG_MSG=y.
>
> When CONFIG_SCTP_DBG_MSG is not set, the null pointer is never
> dereferenced.
...
> Signed-off-by: Tommi Rantala <tt.rantala@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: pull request: batman-adv 2012-11-30
From: David Miller @ 2012-11-30 17:22 UTC (permalink / raw)
To: ordex; +Cc: netdev, b.a.t.m.a.n
In-Reply-To: <1354270450-25935-1-git-send-email-ordex@autistici.org>
From: Antonio Quartulli <ordex@autistici.org>
Date: Fri, 30 Nov 2012 11:14:09 +0100
> Here is a lonely patch intended for net-next/linux-3.8.
> It it simply adapting the batman-adv code to use the new ETH_P_BATMAN define
> recently introduced in if_ether.h.
Pulled, thanks.
^ permalink raw reply
* Re: linux-next: Tree for Nov 29 (netlabel)
From: Casey Schaufler @ 2012-11-30 17:22 UTC (permalink / raw)
To: Randy Dunlap
Cc: Paul Moore, Stephen Rothwell, linux-next, linux-kernel,
netdev@vger.kernel.org, linux-security-module, Casey Schaufler
In-Reply-To: <50B8E4E6.2040901@xenotime.net>
On 11/30/2012 8:55 AM, Randy Dunlap wrote:
> On 11/30/2012 07:31 AM, Paul Moore wrote:
>
>> On Friday, November 30, 2012 10:19:16 AM Paul Moore wrote:
>>> On Thursday, November 29, 2012 04:05:26 PM Randy Dunlap wrote:
>>>> On 11/28/2012 10:40 PM, Stephen Rothwell wrote:
>>>>> Hi all,
>>>>> Changes since 20121128:
>>>> (on i386:)
>>> If I had to guess it looks like CONFIG_NETLABEL needs to be dependent on
>>> CONFIG_INET. While the net/ Kconfig only pulls in the net/netlabel Kconfig
>>> if CONFIG_INET is defined, I'm guessing that without the explicit
>>> dependency there is nothing preventing someone from arriving at a bad
>>> configuration as we see here.
>>>
>>> Let me test this out to make sure my reasoning is right and if it is I'll
>>> post a patch to netdev later today.
>>>
>>> Thanks for catching this.
>> Hmmm. The existing logic in net/Kconfig seems to disable CONFIG_NETLABEL at
>> build time whenever CONFIG_INET is disabled in my .config file. The only way
>> I can recreate what you are seeing here is if I move the NetLabel include
>> outside of the INET conditional in net/Kconfig.
>>
>> Regardless, adding an explicit dependency on INET to NETLABEL shouldn't hurt
>> anything so I'll go ahead and post the patch to netdev. Hopefully someone who
>> understands Kconfig better than I do can help shed some light on this.
> Sorry, this patch doesn't help.
>
> I just checked the kernel .config again. SECURITY_SMACK
> selects NETLABEL even when INET is not enabled. Bad SMACK.
I'll send the patch properly, but it'll look like this.
security/smack/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/security/smack/Kconfig b/security/smack/Kconfig
index 9fb14ef..1be1088 100644
--- a/security/smack/Kconfig
+++ b/security/smack/Kconfig
@@ -1,5 +1,6 @@
config SECURITY_SMACK
bool "Simplified Mandatory Access Control Kernel Support"
+ depends on INET
depends on NET
depends on SECURITY
select NETLABEL
>
> I added Casey and mailing list to the cc:
>
>>>> net/built-in.o: In function `netlbl_cfg_cipsov4_add':
>>>> (.text+0x61757): undefined reference to `cipso_v4_doi_add'
>>>> net/built-in.o: In function `netlbl_cfg_cipsov4_del':
>>>> (.text+0x6177d): undefined reference to `cipso_v4_doi_remove'
>>>> net/built-in.o: In function `netlbl_cfg_cipsov4_map_add':
>>>> (.text+0x617ae): undefined reference to `cipso_v4_doi_getdef'
>>>> net/built-in.o: In function `netlbl_cfg_cipsov4_map_add':
>>>> (.text+0x61a49): undefined reference to `cipso_v4_doi_putdef'
>>>> net/built-in.o: In function `netlbl_sock_setattr':
>>>> (.text+0x6218c): undefined reference to `cipso_v4_sock_setattr'
>>>> net/built-in.o: In function `netlbl_sock_delattr':
>>>> (.text+0x6220b): undefined reference to `cipso_v4_sock_delattr'
>>>> net/built-in.o: In function `netlbl_sock_getattr':
>>>> (.text+0x62238): undefined reference to `cipso_v4_sock_getattr'
>>>> net/built-in.o: In function `netlbl_conn_setattr':
>>>> (.text+0x622de): undefined reference to `cipso_v4_sock_setattr'
>>>> net/built-in.o: In function `netlbl_conn_setattr':
>>>> (.text+0x62303): undefined reference to `cipso_v4_sock_delattr'
>>>> net/built-in.o: In function `netlbl_req_setattr':
>>>> (.text+0x62429): undefined reference to `cipso_v4_req_setattr'
>>>> net/built-in.o: In function `netlbl_req_setattr':
>>>> (.text+0x6244e): undefined reference to `cipso_v4_req_delattr'
>>>> net/built-in.o: In function `netlbl_req_delattr':
>>>> (.text+0x624ba): undefined reference to `cipso_v4_req_delattr'
>>>> net/built-in.o: In function `netlbl_skbuff_setattr':
>>>> (.text+0x62551): undefined reference to `cipso_v4_skbuff_setattr'
>>>> net/built-in.o: In function `netlbl_skbuff_setattr':
>>>> (.text+0x62576): undefined reference to `cipso_v4_skbuff_delattr'
>>>> net/built-in.o: In function `netlbl_skbuff_getattr':
>>>> (.text+0x62619): undefined reference to `cipso_v4_skbuff_getattr'
>>>> net/built-in.o: In function `netlbl_skbuff_err':
>>>> (.text+0x62685): undefined reference to `cipso_v4_error'
>>>> net/built-in.o: In function `netlbl_cache_invalidate':
>>>> (.text+0x626ab): undefined reference to `cipso_v4_cache_invalidate'
>>>> net/built-in.o: In function `netlbl_cache_add':
>>>> (.text+0x626ec): undefined reference to `cipso_v4_cache_add'
>>>> net/built-in.o: In function `netlbl_domhsh_remove_entry':
>>>> (.text+0x63294): undefined reference to `cipso_v4_doi_putdef'
>>>> net/built-in.o: In function `netlbl_domhsh_remove_entry':
>>>> (.text+0x632eb): undefined reference to `cipso_v4_doi_putdef'
>>>> net/built-in.o: In function `netlbl_domhsh_remove_af4':
>>>> (.text+0x6349b): undefined reference to `cipso_v4_doi_putdef'
>>>> net/built-in.o: In function `netlbl_mgmt_add_common.clone.1':
>>>> netlabel_mgmt.c:(.text+0x64a87): undefined reference to
>>>> `cipso_v4_doi_getdef' netlabel_mgmt.c:(.text+0x64c83): undefined reference
>>>> to `cipso_v4_doi_putdef' net/built-in.o: In function
>>>> `netlbl_cipsov4_listall':
>>>> netlabel_cipso_v4.c:(.text+0x66e52): undefined reference to
>>>> `cipso_v4_doi_walk' net/built-in.o: In function `netlbl_cipsov4_list':
>>>> netlabel_cipso_v4.c:(.text+0x67199): undefined reference to
>>>> `cipso_v4_doi_getdef' net/built-in.o: In function `netlbl_cipsov4_remove':
>>>> netlabel_cipso_v4.c:(.text+0x6771b): undefined reference to
>>>> `cipso_v4_doi_remove' net/built-in.o: In function
>>>> `netlbl_cipsov4_add_pass':
>>>> netlabel_cipso_v4.c:(.text+0x67a4b): undefined reference to
>>>> `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x67a76): undefined
>>>> reference
>>>> to `cipso_v4_doi_free' net/built-in.o: In function
>>>> `netlbl_cipsov4_add_local':
>>>> netlabel_cipso_v4.c:(.text+0x67b9a): undefined reference to
>>>> `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x67bc5): undefined
>>>> reference
>>>> to `cipso_v4_doi_free' net/built-in.o: In function
>>>> `netlbl_cipsov4_add_std':
>>>> netlabel_cipso_v4.c:(.text+0x68535): undefined reference to
>>>> `cipso_v4_doi_add' netlabel_cipso_v4.c:(.text+0x68575): undefined
>>>> reference
>>>> to `cipso_v4_doi_free'
>>>>
>>>>
>>>> Full randconfig file is attached.
>
>
^ permalink raw reply related
* Re: [PATCH] net: ICMPv6 packets transmitted on wrong interface if nfmark is mangled
From: David Miller @ 2012-11-30 17:22 UTC (permalink / raw)
To: dries.dewinter; +Cc: pablo, kaber, netdev, netfilter-devel
In-Reply-To: <CA+e04fhY1KjYFwbQ6P=V==kyU3fqMrvrzRJSyz6sy=RwHki07Q@mail.gmail.com>
From: Dries De Winter <dries.dewinter@gmail.com>
Date: Fri, 30 Nov 2012 13:29:20 +0100
> 2012/11/29 David Miller <davem@davemloft.net>:
>> Regardless of the answer to that question, it should be explained
>> in the commit message.
> Should I post a new patch email including this comment?
Yes, please do.
^ permalink raw reply
* Re: [PATCH] smsc: RFC: Workaround for problems with lan8710 phy auto MDI-X
From: David Miller @ 2012-11-30 17:23 UTC (permalink / raw)
To: jkosina; +Cc: pt, otavio, javier, chohnstaedt, netdev, linux-kernel
In-Reply-To: <alpine.LNX.2.00.1211301622110.25639@pobox.suse.cz>
From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 30 Nov 2012 16:23:30 +0100 (CET)
> Of course it'd be far better if faulty hardware can be autodetected in
> runtime.
That is how this must be handled.
^ permalink raw reply
* Re: [PATCH net-next] rtnelink: remove unused parameter from rtnl_create_link().
From: David Miller @ 2012-11-30 17:25 UTC (permalink / raw)
To: ramirose; +Cc: netdev, ebiederm, jiri
In-Reply-To: <1354273727-6336-1-git-send-email-ramirose@gmail.com>
From: Rami Rosen <ramirose@gmail.com>
Date: Fri, 30 Nov 2012 13:08:47 +0200
> This patch removes an unused parameter (src_net) from rtnl_create_link()
> method and from the method single invocation, in veth.
> This parameter was used in the past when calling
> ops->get_tx_queues(src_net, tb) in rtnl_create_link().
> The get_tx_queues() member of rtnl_link_ops was replaced by two methods,
> get_num_tx_queues() and get_num_rx_queues(), which do not get any
> parameter. This was done in commit d40156aa5ecbd51fed932ed4813df82b56e5ff4d by
> Jiri Pirko ("rtnl: allow to specify different num for rx and tx queue count").
>
> Signed-off-by: Rami Rosen <ramirose@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] sctp: verify length provided in heartbeat information parameter
From: David Miller @ 2012-11-30 17:26 UTC (permalink / raw)
To: nhorman; +Cc: tgraf, netdev, linux-sctp
In-Reply-To: <20121130160156.GC6039@hmsreliant.think-freely.org>
From: Neil Horman <nhorman@tuxdriver.com>
Date: Fri, 30 Nov 2012 11:01:57 -0500
> On Fri, Nov 30, 2012 at 12:16:27PM +0000, Thomas Graf wrote:
>> If the variable parameter length provided in the mandatory
>> heartbeat information parameter exceeds the calculated payload
>> length the packet has been corrupted. Reply with a parameter
>> length protocol violation message.
>>
>> Signed-off-by: Thomas Graf <tgraf@suug.ch>
...
>>
> Looks good, thanks Thomas.
> Acked-by: Neil Horman <nhorman@tuxdriver.com>
>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH 0/2] smsc75xx enhancements
From: David Miller @ 2012-11-30 17:27 UTC (permalink / raw)
To: steve.glendinning; +Cc: netdev
In-Reply-To: <1354287164-9884-1-git-send-email-steve.glendinning@shawell.net>
From: Steve Glendinning <steve.glendinning@shawell.net>
Date: Fri, 30 Nov 2012 14:52:42 +0000
> This patchset, as requestes, expands the macros used in
> smsc75xx to make the flow control clearer.
>
> I've left the fix in a separate patch, so the macro-
> expanding patch should have zero functional change.
Applied, thanks for fixing this up.
^ permalink raw reply
* Re: [PATCH 0/5] smsc95xx enhancements
From: David Miller @ 2012-11-30 17:28 UTC (permalink / raw)
To: steve.glendinning; +Cc: netdev
In-Reply-To: <1354290952-27109-1-git-send-email-steve.glendinning@shawell.net>
From: Steve Glendinning <steve.glendinning@shawell.net>
Date: Fri, 30 Nov 2012 15:55:47 +0000
> This patchset is a resubmission of several patches plus two new
> patches, including the expansion of cpp macros at the request of
> davem.
>
> Steve Glendinning (5):
> smsc95xx: fix suspend buffer overflow
> smsc95xx: fix error handling in suspend failure case
> smsc95xx: don't enable remote wakeup directly
> smsc95xx: fix smsc_crc return type
> smsc95xx: expand check_ macros
All applied, thanks again Steve.
^ permalink raw reply
* Re: [PATCH] MAINTAINERS: fix bouncing tun/tap entries
From: David Miller @ 2012-11-30 17:28 UTC (permalink / raw)
To: jslaby; +Cc: maxk, netdev, jirislaby, linux-kernel
In-Reply-To: <1354295140-6355-1-git-send-email-jslaby@suse.cz>
From: Jiri Slaby <jslaby@suse.cz>
Date: Fri, 30 Nov 2012 18:05:40 +0100
> Delivery to the following recipient failed permanently:
>
> vtun@office.satix.net
>
> Technical details of permanent failure:
> DNS Error: Domain name not found
>
> Of course:
> $ host office.satix.net
> Host office.satix.net not found: 3(NXDOMAIN)
>
> ===========
>
> And "Change of Email Address Notification":
> Old Address New Address Email Subject
> ------------------------------------------------------
> maxk@qualcomm.com maxk@qti.qualcomm.com "tuntap: multiqueue...
>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Applied.
^ permalink raw reply
* [PATCH] Smack: Add missing depends on INET in Kconfig
From: Casey Schaufler @ 2012-11-30 17:28 UTC (permalink / raw)
To: Randy Dunlap
Cc: Paul Moore, Stephen Rothwell, linux-next, linux-kernel,
netdev@vger.kernel.org, linux-security-module
In-Reply-To: <50B8E4E6.2040901@xenotime.net>
Because NETLABEL depends on INET SECURITY_SMACK
has to explicitly call out the dependency.
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
---
security/smack/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/security/smack/Kconfig b/security/smack/Kconfig
index 9fb14ef..1be1088 100644
--- a/security/smack/Kconfig
+++ b/security/smack/Kconfig
@@ -1,5 +1,6 @@
config SECURITY_SMACK
bool "Simplified Mandatory Access Control Kernel Support"
+ depends on INET
depends on NET
depends on SECURITY
select NETLABEL
^ permalink raw reply related
* Re: [PATCH] sctp: verify length provided in heartbeat information parameter
From: Vlad Yasevich @ 2012-11-30 17:34 UTC (permalink / raw)
To: Thomas Graf; +Cc: davem, netdev, linux-sctp
In-Reply-To: <20121130121627.GG30697@casper.infradead.org>
On 11/30/2012 07:16 AM, Thomas Graf wrote:
> If the variable parameter length provided in the mandatory
> heartbeat information parameter exceeds the calculated payload
> length the packet has been corrupted. Reply with a parameter
> length protocol violation message.
>
> Signed-off-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
-vlad
> ---
> net/sctp/sm_statefuns.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
> index b6adef8..e92079d 100644
> --- a/net/sctp/sm_statefuns.c
> +++ b/net/sctp/sm_statefuns.c
> @@ -1055,6 +1055,7 @@ sctp_disposition_t sctp_sf_beat_8_3(struct net *net,
> void *arg,
> sctp_cmd_seq_t *commands)
> {
> + sctp_paramhdr_t *param_hdr;
> struct sctp_chunk *chunk = arg;
> struct sctp_chunk *reply;
> size_t paylen = 0;
> @@ -1072,12 +1073,17 @@ sctp_disposition_t sctp_sf_beat_8_3(struct net *net,
> * Information field copied from the received HEARTBEAT chunk.
> */
> chunk->subh.hb_hdr = (sctp_heartbeathdr_t *) chunk->skb->data;
> + param_hdr = (sctp_paramhdr_t *) chunk->subh.hb_hdr;
> paylen = ntohs(chunk->chunk_hdr->length) - sizeof(sctp_chunkhdr_t);
> +
> + if (ntohs(param_hdr->length) > paylen)
> + return sctp_sf_violation_paramlen(net, ep, asoc, type, arg,
> + param_hdr, commands);
> +
> if (!pskb_pull(chunk->skb, paylen))
> goto nomem;
>
> - reply = sctp_make_heartbeat_ack(asoc, chunk,
> - chunk->subh.hb_hdr, paylen);
> + reply = sctp_make_heartbeat_ack(asoc, chunk, param_hdr, paylen);
> if (!reply)
> goto nomem;
>
> --
> 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
>
^ permalink raw reply
* Re: [PATCH v2 3/3] pppoatm: protect against freeing of vcc
From: Krzysztof Mazur @ 2012-11-30 17:39 UTC (permalink / raw)
To: chas williams - CONTRACTOR
Cc: David Woodhouse, David Laight, davem, netdev, linux-kernel,
nathan
In-Reply-To: <20121130121256.77685fef@thirdoffive.cmf.nrl.navy.mil>
On Fri, Nov 30, 2012 at 12:12:56PM -0500, chas williams - CONTRACTOR wrote:
> >Really, what we're saying is that *one* of the driver or protocol close
> >functions needs to be split, and we need to do DPD or PDP. Since the
> >device driver *can* abort/flush the TX queue and also any pending RX
> >being handled by a tasklet, I think it makes most sense to keep it in
> >the middle, with the protocol being handled first and last... which is
> >the current order, as long as we consider setting ATM_VF_CLOSE to be the
> >first part.
>
> i believe this is essentially already done with the release_cb()
> implementation right? that is splitting the protocol detach/shutdown
> into two parts.
partially, release_cb() is about ATM socket locking. To avoid some races
we need to take the ATM socket lock in protocol send function
(br2684_start_xmit, pppoatm_send, ...). That functions are executed
in bh context and we cannot sleep and wait for releasing the ATM socket
lock, so we just block sending and when the ATM socket is unlocked
release_cb() is called and we re-enabling sending.
Currently the first part of detach is just:
lock_sock(sk)
(without latest "br2684: don't send frames on not-ready vcc"
the first part was
set_bit(ATM_VF_CLOSE, &vcc->flags);
clear_bit(ATM_VF_READY, &vcc->flags);
for br2684)
After that the protocol stops sending new packets so the vcc may be
fully closed by ATM driver. The protocol is still ready to process
received packets. After vcc is closed the protocol can safely detach
knowing that no new packets will be received.
Krzysiek
^ permalink raw reply
* Re: [PATCH] Smack: Add missing depends on INET in Kconfig
From: Randy Dunlap @ 2012-11-30 17:40 UTC (permalink / raw)
To: Casey Schaufler
Cc: Randy Dunlap, Paul Moore, Stephen Rothwell, linux-next,
linux-kernel, netdev@vger.kernel.org, linux-security-module
In-Reply-To: <50B8ECB3.2090801@schaufler-ca.com>
On 11/30/2012 09:28 AM, Casey Schaufler wrote:
> Because NETLABEL depends on INET SECURITY_SMACK
> has to explicitly call out the dependency.
>
> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Thanks for the quick fix.
> ---
> security/smack/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/security/smack/Kconfig b/security/smack/Kconfig
> index 9fb14ef..1be1088 100644
> --- a/security/smack/Kconfig
> +++ b/security/smack/Kconfig
> @@ -1,5 +1,6 @@
> config SECURITY_SMACK
> bool "Simplified Mandatory Access Control Kernel Support"
> + depends on INET
> depends on NET
> depends on SECURITY
> select NETLABEL
>
> --
--
~Randy
^ permalink raw reply
* pull request: wireless 2012-11-30
From: John W. Linville @ 2012-11-30 18:25 UTC (permalink / raw)
To: davem; +Cc: linux-wireless, netdev, linux-kernel
commit 9f8933e960f98d27742727445061b0ece934e5cf
Dave,
I have a couple of stragglers intended for 3.7...
The iwlwifi patch fixes a bug in CCK basic rate calculations.
The mac80211 patch removes an unnecessary function call that was
generating a lot of log SPAM.
Please let me know if there are problems!
John
---
The following changes since commit e196c0e579902f42cf72414461fb034e5a1ffbf7:
bonding: fix race condition in bonding_store_slaves_active (2012-11-29 13:13:15 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
for you to fetch changes up to 9f8933e960f98d27742727445061b0ece934e5cf:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2012-11-30 11:27:32 -0500)
----------------------------------------------------------------
Emmanuel Grumbach (1):
iwlwifi: fix the basic CCK rates calculation
Johannes Berg (1):
mac80211: fix remain-on-channel (non-)cancelling
John W. Linville (2):
Merge branch 'for-john' of git://git.kernel.org/.../iwlwifi/iwlwifi-fixes
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
drivers/net/wireless/iwlwifi/dvm/rxon.c | 12 ++++++------
net/mac80211/offchannel.c | 2 --
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/dvm/rxon.c b/drivers/net/wireless/iwlwifi/dvm/rxon.c
index 1089639..2830ea2 100644
--- a/drivers/net/wireless/iwlwifi/dvm/rxon.c
+++ b/drivers/net/wireless/iwlwifi/dvm/rxon.c
@@ -1012,12 +1012,12 @@ static void iwl_calc_basic_rates(struct iwl_priv *priv,
* As a consequence, it's not as complicated as it sounds, just add
* any lower rates to the ACK rate bitmap.
*/
- if (IWL_RATE_11M_INDEX < lowest_present_ofdm)
- ofdm |= IWL_RATE_11M_MASK >> IWL_FIRST_CCK_RATE;
- if (IWL_RATE_5M_INDEX < lowest_present_ofdm)
- ofdm |= IWL_RATE_5M_MASK >> IWL_FIRST_CCK_RATE;
- if (IWL_RATE_2M_INDEX < lowest_present_ofdm)
- ofdm |= IWL_RATE_2M_MASK >> IWL_FIRST_CCK_RATE;
+ if (IWL_RATE_11M_INDEX < lowest_present_cck)
+ cck |= IWL_RATE_11M_MASK >> IWL_FIRST_CCK_RATE;
+ if (IWL_RATE_5M_INDEX < lowest_present_cck)
+ cck |= IWL_RATE_5M_MASK >> IWL_FIRST_CCK_RATE;
+ if (IWL_RATE_2M_INDEX < lowest_present_cck)
+ cck |= IWL_RATE_2M_MASK >> IWL_FIRST_CCK_RATE;
/* 1M already there or needed so always add */
cck |= IWL_RATE_1M_MASK >> IWL_FIRST_CCK_RATE;
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c
index 83608ac..2c84185 100644
--- a/net/mac80211/offchannel.c
+++ b/net/mac80211/offchannel.c
@@ -458,8 +458,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata)
list_move_tail(&roc->list, &tmp_list);
roc->abort = true;
}
-
- ieee80211_start_next_roc(local);
mutex_unlock(&local->mtx);
list_for_each_entry_safe(roc, tmp, &tmp_list, list) {
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
^ permalink raw reply related
* Re: [PATCH v2 3/3] pppoatm: protect against freeing of vcc
From: David Woodhouse @ 2012-11-30 18:33 UTC (permalink / raw)
To: Krzysztof Mazur
Cc: Chas Williams (CONTRACTOR), David Laight, davem, netdev,
linux-kernel, nathan
In-Reply-To: <20121130170007.GA25818@shrek.podlesie.net>
[-- Attachment #1: Type: text/plain, Size: 813 bytes --]
On Fri, 2012-11-30 at 18:00 +0100, Krzysztof Mazur wrote:
> On Fri, Nov 30, 2012 at 04:23:46PM +0000, David Woodhouse wrote:
> >
> > +static void br2684_release_cb(struct atm_vcc *atmvcc)
> > +{
> > + struct br2684_vcc *brvcc = BR2684_VCC(atmvcc);
> > +
> > + /*
> > + * A race with br2684_xmit_vcc() might cause a spurious wakeup just
> > + * after that function *stops* the queue, and qspace might actually
> > + * go negative before the queue stops again. We cope with that.
> > + */
>
> We cannot race with br2684_xmit_vcc() because both br2684_xmit_vcc()
> and br2684_release_cb() are called with locked sk->sk_lock.slock.
Ah, right. For some reason I thought the lock was already dropped when
->release_cb() was called. In that case I'll remove the comment. Thanks.
--
dwmw2
[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 6171 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox