* (unknown)
From: to2 @ 2016-05-03 21:03 UTC (permalink / raw)
To: netdev
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="GB2312", Size: 872 bytes --]
ëSÖøÖЇø½›úµÄ¸ßËÙ°lÕ¹£¬²»ÉÙÆó˜I¶¼ÔÚëŠ×ÓÉÌ„Õß@‚€ÐИI°lÕ¹é_í£¬ÊЈö¸‚ Ž×ƒµÃ·Ç³£¼¤ÁÒ¡£ ´Ë•r£¬ÈçºÎ¼°•rœÊ´_µÄÕÒµ½¿Í‘ôÐÅÏ¢£¬Œ¦ì¶Æó˜IíÕf׃µÃ®³£ÖØÒª£¬Òòžéß@²»ƒH¿ÉÒÔ¹¼s•rég³É±¾£¬¸üÖØÒªµÄÊÇ¿ÉÒÔ“ŒÕ¼ÏÈ™C¡£ Èç¹ûÄãȱÉÙ¿Í‘ô£¬Ò²›]Óп͑ôÙYÁÏ£¬ÄÇüNÄãÒѽ›ÂýÄãµÄͬÐÐÒ»²½ÁË¡£ ›]Óнݽ£¬Ö»Óи¶³öº¹Ë®£¬ÌìŸáÁËÄãÈçºÎÈ¥ÕÒ¿Í‘ô£¿ ºÜ¶àÈËßx“ñÁËëŠÔ’£¬›Q¶¨¸¶³ö×Ô¼ºµÄ¿ÚÉ࣬µ«ÙYÁÏÄÄÄí£¬†–î}ÓÖ³ö¬FÁË£¬ÓÖÒ»´ÎÃÔʧÔÚÁËŒ¤ÕÒ¿Í‘ôµÄë…ìFÖС£ ¬FÔÚÊÇ»¥Â“¾WµÄ•r´ú£¡»ù춾W½jß@‚€´ó”µ“þŽì¶øÕQÉúµÄÍâÙQÜ›¼þ£¬ÒÔÜ›¼þžé˜ò£¬ÒÔ¾W½jžé¾€£¬ÒÔÈ«ÇòÐÅÏ¢žé”µ“þŽì£¡ ¼ÜÔOͨÍùº£ÍâµÄ¿µÇf´óµÀ£¡ÄãÔÚªqÔ¥¡¢Ó^ÍûµÄ•rºò£¬ÄãµÄͬÐÐÒѽ›ÔÚÓÃÜ›¼þÿÌìÌáÈ¡ÉÏÈf—l¿Í‘ôÐÅÏ¢ÁË£¬®”ÔÙÍâÙQÜ›¼þºÍƽ̨չ•þÒ»˜Ó³ÉÖ÷Á÷•r£¬ÄãÓÖʧȥÁËÒ»´Î¾Í•þ£¡ ÀûÓÇøëHºÍ¸÷‡øÖ÷Á÷ËÑË÷ÒýÇ棬ݔÈë®aÆ·êPæI×־ͼ´¿ÉÅúÁ¿ÌáÈ¡¿Í‘ôÙYÁÏ£¡È«Çò200‚€‡ø¼ÒÏÂ700¶à‚€®”µØÖ÷Á÷ÒýÇæÈÎÄúËÑË÷é_°l£¡
Èç¹ûÄúŒ¦ÎÒ‚ƒ®aÆ·ÒÔ¼°·þ„Õ¸ÐÅdȤ£¬šgÓ¼ÓÎÒQQÔ”Õ„¡£
QQ:2188578837
Contact number:0755-32913073
^ permalink raw reply
* Re: [PATCH] fix infoleak in wireless
From: Greg Kroah-Hartman @ 2016-05-03 21:00 UTC (permalink / raw)
To: Kangjie Lu
Cc: Johannes Berg, davem, linux-wireless, linux-kernel, netdev,
Kangjie Lu
In-Reply-To: <CABEk9YxqyBxnqOseJ3-d-aKxnREZBFt1z89nOjHf=DvNQy_hTw@mail.gmail.com>
A: No.
Q: Should I include quotations after my reply?
http://daringfireball.net/2007/07/on_top
On Tue, May 03, 2016 at 04:47:16PM -0400, Kangjie Lu wrote:
> Hi Greg,
>
> Could you please take a look at this issue.
> mac_addr is not initialized is some implementations of dump_station(), which
> can be exploited by attackers for leaking information.
You are going to have to give me more context here...
Like the patch itself?
thanks,
greg k-h
^ permalink raw reply
* [PATCH] fix infoleak in rtnetlink
From: Kangjie Lu @ 2016-05-03 20:46 UTC (permalink / raw)
To: davem; +Cc: sfeldma, roopa, jiri, netdev, linux-kernel, taesoo, insu,
Kangjie Lu
The stack object “map” has a total size of 32 bytes. Its last 4
bytes are padding generated by compiler. These padding bytes are
not initialized and sent out via “nla_put”.
Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
---
net/core/rtnetlink.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index a75f7e9..65763c2 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1180,14 +1180,16 @@ static noinline_for_stack int rtnl_fill_vfinfo(struct sk_buff *skb,
static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)
{
- struct rtnl_link_ifmap map = {
- .mem_start = dev->mem_start,
- .mem_end = dev->mem_end,
- .base_addr = dev->base_addr,
- .irq = dev->irq,
- .dma = dev->dma,
- .port = dev->if_port,
- };
+ struct rtnl_link_ifmap map;
+
+ memset(&map, 0, sizeof(map));
+ map.mem_start = dev->mem_start;
+ map.mem_end = dev->mem_end;
+ map.base_addr = dev->base_addr;
+ map.irq = dev->irq;
+ map.dma = dev->dma;
+ map.port = dev->if_port;
+
if (nla_put(skb, IFLA_MAP, sizeof(map), &map))
return -EMSGSIZE;
--
1.9.1
^ permalink raw reply related
* Re: [PATCH] fix infoleak in wireless
From: Johannes Berg @ 2016-05-03 20:40 UTC (permalink / raw)
To: Kangjie Lu; +Cc: davem, linux-wireless, linux-kernel, netdev, Kangjie Lu
In-Reply-To: <1462308013-6032-1-git-send-email-kjlu@gatech.edu>
On Tue, 2016-05-03 at 16:40 -0400, Kangjie Lu wrote:
> The 6-bytes array “mac_addr” is not initialized in the dump_station
> implementations of
> “drivers/staging/wilc1000/wilc_wfi_cfgoperations.c”
> and “drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c”, so all 6
> bytes may be leaked.
Like I said to you before, this makes those implementations completely
broken. I'm not going to apply this patch. If you want, feel free to
send patches to Greg to remove those dump_station implementations that
are completely broken and that can never do anything useful.
johannes
^ permalink raw reply
* [PATCH] fix infoleak in wireless
From: Kangjie Lu @ 2016-05-03 20:40 UTC (permalink / raw)
To: johannes; +Cc: davem, linux-wireless, linux-kernel, netdev, Kangjie Lu
The 6-bytes array “mac_addr” is not initialized in the dump_station
implementations of “drivers/staging/wilc1000/wilc_wfi_cfgoperations.c”
and “drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c”, so all 6
bytes may be leaked.
Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
---
net/wireless/nl80211.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 056a730..2e92d14 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3905,6 +3905,7 @@ static int nl80211_dump_station(struct sk_buff *skb,
while (1) {
memset(&sinfo, 0, sizeof(sinfo));
+ eth_zero_addr(mac_addr);
err = rdev_dump_station(rdev, wdev->netdev, sta_idx,
mac_addr, &sinfo);
if (err == -ENOENT)
--
1.9.1
^ permalink raw reply related
* [GIT] Networking
From: David Miller @ 2016-05-03 20:38 UTC (permalink / raw)
To: torvalds; +Cc: akpm, netdev, linux-kernel
Some straggler bug fixes:
1) Batman-adv DAT must consider VLAN IDs when choosing candidate nodes, from
Antonio Quartulli.
2) Fix botched reference counting of vlan objects and neigh nodes in batman-adv,
from Sven Eckelmann.
3) netem can crash when it sees GSO packets, the fix is to segment then upon
->enqueue. Fix from Neil Horman with help from Eric Dumazet.
4) Fix VXLAN dependencies in mlx5 driver Kconfig, from Matthew Finlay.
5) Handle VXLAN ops outside of rcu lock, via a workqueue, in mlx5, since it
can sleep. Fix also from Matthew Finlay.
6) Check mdiobus_scan() return values properly in pxa168_eth and macb
drivers. From Sergei Shtylyov.
7) If the netdevice doesn't support checksumming, disable segmentation.
From Alexandery Duyck.
8) Fix races between RDS tcp accept and sending, from Sowmini Varadhan.
9) In macb driver, probe MDIO bus before we register the netdev, otherwise
we can try to open the device before it is really ready for that. Fix
from Florian Fainelli.
10) Netlink attribute size for ILA "tunnels" not calculated properly, fix
from Nicolas Dichtel.
Please pull, thanks a lot!
The following changes since commit 33656a1f2ee5346c742d63ddd0e0970c95a56b70:
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs (2016-05-02 09:59:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
for you to fetch changes up to 79e8dc8b80bff0bc5bbb90ca5e73044bf207c8ac:
ipv6/ila: fix nlsize calculation for lwtunnel (2016-05-03 16:21:33 -0400)
----------------------------------------------------------------
Alexander Duyck (2):
net: Disable segmentation if checksumming is not supported
vxlan: Add checksum check to the features check function
Anna-Maria Gleixner (1):
net: mvneta: Remove superfluous SMP function call
Antonio Quartulli (2):
batman-adv: fix DAT candidate selection (must use vid)
batman-adv: B.A.T.M.A.N V - make sure iface is reactivated upon NETDEV_UP event
David S. Miller (4):
Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-merge
Merge branch 'mlx5-fixes'
Merge branch 'tunnel-csum-and-sg-offloads'
Merge branch 'rds-fixes'
Florian Fainelli (1):
net: macb: Probe MDIO bus before registering netdev
Gal Pressman (1):
net/mlx5: Unmap only the relevant IO memory mapping
Matthew Finlay (3):
net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue
net/mlx5e: Implement a mlx5e workqueue
net/mlx5e: Use workqueue for vxlan ops
Neil Horman (1):
netem: Segment GSO packets on enqueue
Nicolas Dichtel (1):
ipv6/ila: fix nlsize calculation for lwtunnel
Sergei Shtylyov (2):
pxa168_eth: fix mdiobus_scan() error check
macb: fix mdiobus_scan() error check
Sowmini Varadhan (2):
RDS:TCP: Synchronize rds_tcp_accept_one with rds_send_xmit when resetting t_sock
RDS: TCP: Synchronize accept() and connect() paths on t_conn_lock.
Sven Eckelmann (2):
batman-adv: Fix reference counting of vlan object for tt_local_entry
batman-adv: Fix reference counting of hardif_neigh_node object for neigh_node
drivers/net/ethernet/cadence/macb.c | 34 +++++++++++++++++++++-------------
drivers/net/ethernet/marvell/mvneta.c | 6 ++----
drivers/net/ethernet/marvell/pxa168_eth.c | 2 ++
drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 +
drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 +
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 34 +++++++++++++++++++++-------------
drivers/net/ethernet/mellanox/mlx5/core/uar.c | 6 ++++--
drivers/net/ethernet/mellanox/mlx5/core/vxlan.c | 50 ++++++++++++++++++++++++++++++++++++++------------
drivers/net/ethernet/mellanox/mlx5/core/vxlan.h | 11 +++++++++--
include/linux/if_ether.h | 5 +++++
include/net/vxlan.h | 4 +++-
net/batman-adv/bat_v.c | 12 ++++++++++++
net/batman-adv/distributed-arp-table.c | 17 ++++++++++-------
net/batman-adv/hard-interface.c | 3 +++
net/batman-adv/originator.c | 16 +++++-----------
net/batman-adv/translation-table.c | 42 ++++--------------------------------------
net/batman-adv/types.h | 7 +++++++
net/core/dev.c | 2 +-
net/ipv6/ila/ila_lwt.c | 3 +--
net/rds/tcp.c | 3 ++-
net/rds/tcp.h | 4 ++++
net/rds/tcp_connect.c | 8 ++++++++
net/rds/tcp_listen.c | 54 ++++++++++++++++++++++++++++++++++++------------------
net/sched/sch_netem.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
24 files changed, 259 insertions(+), 127 deletions(-)
^ permalink raw reply
* [PATCH] fix infoleak in llc
From: Kangjie Lu @ 2016-05-03 20:35 UTC (permalink / raw)
To: acme; +Cc: davem, netdev, linux-kernel, taesoo, insu, Kangjie Lu
The stack object “info” has a total size of 12 bytes. Its last byte
is padding which is not initialized and leaked via “put_cmsg”.
Signed-off-by: Kangjie Lu <kjlu@gatech.edu>
---
net/llc/af_llc.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index b3c52e3..8ae3ed9 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -626,6 +626,7 @@ static void llc_cmsg_rcv(struct msghdr *msg, struct sk_buff *skb)
if (llc->cmsg_flags & LLC_CMSG_PKTINFO) {
struct llc_pktinfo info;
+ memset(&info, 0, sizeof(info));
info.lpi_ifindex = llc_sk(skb->sk)->dev->ifindex;
llc_pdu_decode_dsap(skb, &info.lpi_sap);
llc_pdu_decode_da(skb, info.lpi_mac);
--
1.9.1
^ permalink raw reply related
* Re: [PATCH net] bridge: fix igmp / mld query parsing
From: Stephen Hemminger @ 2016-05-03 20:26 UTC (permalink / raw)
To: Linus Lüssing
Cc: Simon Wunderlich, netdev, bridge, David S . Miller, linux-kernel
In-Reply-To: <1462306734-4183-1-git-send-email-linus.luessing@c0d3.blue>
On Tue, 3 May 2016 22:18:54 +0200
Linus Lüssing <linus.luessing@c0d3.blue> wrote:
> diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
> index 03661d9..7105cdf 100644
> --- a/net/bridge/br_multicast.c
> +++ b/net/bridge/br_multicast.c
> @@ -1271,6 +1271,7 @@ static int br_ip4_multicast_query(struct net_bridge *br,
> unsigned long max_delay;
> unsigned long now = jiffies;
> __be32 group;
> + int offset = skb_transport_offset(skb);
shouldn't this be unsigned?
^ permalink raw reply
* Re: [PATCH net v1] ipv6/ila: fix nlsize calculation for lwtunnel
From: David Miller @ 2016-05-03 20:22 UTC (permalink / raw)
To: nicolas.dichtel; +Cc: netdev, tom
In-Reply-To: <1462262307-27498-1-git-send-email-nicolas.dichtel@6wind.com>
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Tue, 3 May 2016 09:58:27 +0200
> The handler 'ila_fill_encap_info' adds one attribute: ILA_ATTR_LOCATOR.
>
> Fixes: 65d7ab8de582 ("net: Identifier Locator Addressing module")
> CC: Tom Herbert <tom@herbertland.com>
> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
> ---
>
> RFC -> v1:
> - rebase on last net tree
Applied and queued up for -stable, thanks for reposting this Nicolas.
^ permalink raw reply
* Re: [PATCH net-next] tcp: guarantee forward progress in tcp_sendmsg()
From: David Miller @ 2016-05-03 20:20 UTC (permalink / raw)
To: eric.dumazet; +Cc: edumazet, netdev, soheil, ast, marcelo.leitner
In-Reply-To: <1462250965.5535.286.camel@edumazet-glaptop3.roam.corp.google.com>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 02 May 2016 21:49:25 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> Under high rx pressure, it is possible tcp_sendmsg() never has a
> chance to allocate an skb and loop forever as sk_flush_backlog()
> would always return true.
>
> Fix this by calling sk_flush_backlog() only if one skb had been
> allocated and filled before last backlog check.
>
> Fixes: d41a69f1d390 ("tcp: make tcp_sendmsg() aware of socket backlog")
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next v2] ipv6: add new struct ipcm6_cookie
From: David Miller @ 2016-05-03 20:20 UTC (permalink / raw)
To: weiwan; +Cc: netdev
In-Reply-To: <1462250407-19496-1-git-send-email-tracywwnj@gmail.com>
From: Wei Wang <weiwan@google.com>
Date: Mon, 2 May 2016 21:40:07 -0700
> From: Wei Wang <weiwan@google.com>
>
> In the sendmsg function of UDP, raw, ICMP and l2tp sockets, we use local
> variables like hlimits, tclass, opt and dontfrag and pass them to corresponding
> functions like ip6_make_skb, ip6_append_data and xxx_push_pending_frames.
> This is not a good practice and makes it hard to add new parameters.
> This fix introduces a new struct ipcm6_cookie similar to ipcm_cookie in
> ipv4 and include the above mentioned variables. And we only pass the
> pointer to this structure to corresponding functions. This makes it easier
> to add new parameters in the future and makes the function cleaner.
>
> Signed-off-by: Wei Wang <weiwan@google.com>
Applied, thanks.
^ permalink raw reply
* [PATCH net] bridge: fix igmp / mld query parsing
From: Linus Lüssing @ 2016-05-03 20:18 UTC (permalink / raw)
To: netdev; +Cc: Simon Wunderlich, bridge, linux-kernel, David S . Miller
With the newly introduced helper functions the skb pulling is hidden
in the checksumming function - and undone before returning to the
caller.
The IGMP and MLD query parsing functions in the bridge still
assumed that the skb is pointing to the beginning of the IGMP/MLD
message while it is now kept at the beginning of the IPv4/6 header.
If there is a querier somewhere else, then this either causes
the multicast snooping to stay disabled even though it could be
enabled. Or, if we have the querier enabled too, then this can
create unnecessary IGMP / MLD query messages on the link.
Fixing this by taking the offset between IP and IGMP/MLD header into
account, too.
Fixes: 9afd85c9e455 ("net: Export IGMP/MLD message validation code")
Reported-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
net/bridge/br_multicast.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 03661d9..7105cdf 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1271,6 +1271,7 @@ static int br_ip4_multicast_query(struct net_bridge *br,
unsigned long max_delay;
unsigned long now = jiffies;
__be32 group;
+ int offset = skb_transport_offset(skb);
int err = 0;
spin_lock(&br->multicast_lock);
@@ -1280,14 +1281,14 @@ static int br_ip4_multicast_query(struct net_bridge *br,
group = ih->group;
- if (skb->len == sizeof(*ih)) {
+ if (skb->len == offset + sizeof(*ih)) {
max_delay = ih->code * (HZ / IGMP_TIMER_SCALE);
if (!max_delay) {
max_delay = 10 * HZ;
group = 0;
}
- } else if (skb->len >= sizeof(*ih3)) {
+ } else if (skb->len >= offset + sizeof(*ih3)) {
ih3 = igmpv3_query_hdr(skb);
if (ih3->nsrcs)
goto out;
@@ -1350,6 +1351,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
unsigned long now = jiffies;
const struct in6_addr *group = NULL;
bool is_general_query;
+ int offset = skb_transport_offset(skb);
int err = 0;
spin_lock(&br->multicast_lock);
@@ -1357,8 +1359,8 @@ static int br_ip6_multicast_query(struct net_bridge *br,
(port && port->state == BR_STATE_DISABLED))
goto out;
- if (skb->len == sizeof(*mld)) {
- if (!pskb_may_pull(skb, sizeof(*mld))) {
+ if (skb->len == offset + sizeof(*mld)) {
+ if (!pskb_may_pull(skb, offset + sizeof(*mld))) {
err = -EINVAL;
goto out;
}
@@ -1367,7 +1369,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
if (max_delay)
group = &mld->mld_mca;
} else {
- if (!pskb_may_pull(skb, sizeof(*mld2q))) {
+ if (!pskb_may_pull(skb, offset + sizeof(*mld2q))) {
err = -EINVAL;
goto out;
}
--
1.7.10.4
^ permalink raw reply related
* [PATCH] mdio_bus: don't return NULL from mdiobus_scan()
From: Sergei Shtylyov @ 2016-05-03 20:14 UTC (permalink / raw)
To: netdev, f.fainelli
I've finally noticed that mdiobus_scan() also returns either NULL or error
value on failure. Return ERR_PTR(-ENODEV) instead of NULL since this is
the error value already filtered out by the callers that want to ignore
the MDIO address scan failure...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
The patch is against DaveM's 'net-next.git' repo.
drivers/net/phy/mdio_bus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: net-next/drivers/net/phy/mdio_bus.c
===================================================================
--- net-next.orig/drivers/net/phy/mdio_bus.c
+++ net-next/drivers/net/phy/mdio_bus.c
@@ -435,7 +435,7 @@ struct phy_device *mdiobus_scan(struct m
err = phy_device_register(phydev);
if (err) {
phy_device_free(phydev);
- return NULL;
+ return ERR_PTR(-ENODEV);
}
return phydev;
^ permalink raw reply
* Re: [PATCHv2 bluetooth-next 00/10] 6lowpan: introduce basic 6lowpan-nd
From: David Miller @ 2016-05-03 20:07 UTC (permalink / raw)
To: marcel-kz+m5ild9QBg9hUCZPvPmw
Cc: hannes-tFNcAqjVMyqKXQKiL6tip0B+6BGkLq7r,
aar-bIcnvbaLZ9MEGnE8C9+IrQ, linux-wpan-u79uwXL29TY76Z2rM5mHXA,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ,
jukka.rissanen-VuQAYsv1563Yd54FQh9/CA,
stefan-JPH+aEBZ4P+UEJcrhfAQsw, mcr-SWp7JaYWvAQV+D8aMU/kSg,
werner-SEdMjqphH88wryQfseakQg,
linux-bluetooth-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, kuznet-v/Mj1YrvjDBInbfyfbPRSQ,
jmorris-gx6/JNMH7DfYtjvyW6yDsg, yoshfuji-VfPWfsRibaP+Ru+s062T9g,
kaber-dcUjhNyLwpNeoWH0uzbU5w
In-Reply-To: <58926844-0338-4D63-A5B6-DB0EBE903A0E-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>
From: Marcel Holtmann <marcel-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org>
Date: Mon, 2 May 2016 16:17:41 -0700
>> My proposal would be that the IPv6 patches go via net-next to reduce
>> merge conflicts with maybe upcoming changes. If they are split up, they
>> seem very much self contained and easy to review. The rest seems to be
>> also very much self contained and can go in via bluetooth-next, then.
>> What do you think?
>
> I am actually fine with having this all go via net-next. We only
> have driver patches pending in bluetooth-next for the next merge
> window. Which means I can just pull net-next back into
> bluetooth-next at any time.
Ok, just resubmit the series explicitly targetting net-next then.
Thanks.
^ permalink raw reply
* Re: [PATCH net] net: macb: Probe MDIO bus before registering netdev
From: David Miller @ 2016-05-03 20:06 UTC (permalink / raw)
To: f.fainelli; +Cc: netdev, nicolas.ferre
In-Reply-To: <1462239525-22723-1-git-send-email-f.fainelli@gmail.com>
From: Florian Fainelli <f.fainelli@gmail.com>
Date: Mon, 2 May 2016 18:38:45 -0700
> The current sequence makes us register for a network device prior to
> registering and probing the MDIO bus which could lead to some unwanted
> consequences, like a thread of execution calling into ndo_open before
> register_netdev() returns, while the MDIO bus is not ready yet.
>
> Rework the sequence to register for the MDIO bus, and therefore attach
> to a PHY prior to calling register_netdev(), which implies reworking the
> error path a bit.
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Applied, thanks Florian.
^ permalink raw reply
* Re: [PATCH net v2 0/2] RDS: TCP: sychronization during connection startup
From: David Miller @ 2016-05-03 20:05 UTC (permalink / raw)
To: sowmini.varadhan; +Cc: netdev, rds-devel, santosh.shilimkar
In-Reply-To: <cover.1462212462.git.sowmini.varadhan@oracle.com>
From: Sowmini Varadhan <sowmini.varadhan@oracle.com>
Date: Mon, 2 May 2016 11:24:50 -0700
> This patch series ensures that the passive (accept) side of the
> TCP connection used for RDS-TCP is correctly synchronized with
> any concurrent active (connect) attempts for a given pair of peers.
>
> Patch 1 in the series makes sure that the t_sock in struct
> rds_tcp_connection is only reset after any threads in rds_tcp_xmit
> have completed (otherwise a null-ptr deref may be encountered).
> Patch 2 synchronizes rds_tcp_accept_one() with the rds_tcp*connect()
> path.
>
> v2: review comments from Santosh Shilimkar, other spelling corrections
Series applied, thanks.
^ permalink raw reply
* Re: [PATCH net-next] net: add __sock_wfree() helper
From: David Miller @ 2016-05-03 20:02 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <1462211787.5535.269.camel@edumazet-glaptop3.roam.corp.google.com>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 02 May 2016 10:56:27 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> Hosts sending lot of ACK packets exhibit high sock_wfree() cost
> because of cache line miss to test SOCK_USE_WRITE_QUEUE
>
> We could move this flag close to sk_wmem_alloc but it is better
> to perform the atomic_sub_and_test() on a clean cache line,
> as it avoid one extra bus transaction.
>
> skb_orphan_partial() can also have a fast track for packets that either
> are TCP acks, or already went through another skb_orphan_partial()
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied, thanks.
^ permalink raw reply
* Re: [net-next PATCH v3 0/8] Fix Tunnel features and enable GSO partial for several drivers
From: David Miller @ 2016-05-03 20:01 UTC (permalink / raw)
To: aduyck; +Cc: talal, netdev, michael.chan, alexander.duyck, galp, ogerlitz,
eranbe
In-Reply-To: <20160502162828.11809.92444.stgit@ahduyck-xeon-server>
From: Alexander Duyck <aduyck@mirantis.com>
Date: Mon, 02 May 2016 09:38:06 -0700
> v3: Moved 2 patches into series for net as they were generic fixes.
> Added patch to disable GSO partial if frame is less than 2x size of MSS
I'll therefore apply this series after my next net --> net-next merge.
Thanks.
^ permalink raw reply
* Re: [net PATCH 0/2] Fixes for tunnel checksum and segmentation offloads
From: David Miller @ 2016-05-03 20:01 UTC (permalink / raw)
To: aduyck; +Cc: netdev, ogerlitz, alexander.duyck
In-Reply-To: <20160502161621.11701.9271.stgit@ahduyck-xeon-server>
From: Alexander Duyck <aduyck@mirantis.com>
Date: Mon, 02 May 2016 09:25:04 -0700
> This patch series is a subset of patches I had submitted for net-next. I
> plan to drop these two patches from the v3 of "Fix Tunnel features and
> enable GSO partial for several drivers" and I am instead submitting them
> for net since these are truly fixes and likely will need to be backported
> to stable branches.
>
> This series addresses 2 specific issues. The first is that we could
> request TSO on a v4 inner header while not supporting checksum offload of
> the outer IPv6 header. The second is that we could request an IPv6 inner
> checksum offload without validating that we could actually support an inner
> IPv6 checksum offload.
Series applied, thanks.
^ permalink raw reply
* Re: [PATCH net-next 0/3] tipc: redesign socket-level flow control
From: David Miller @ 2016-05-03 19:51 UTC (permalink / raw)
To: jon.maloy
Cc: netdev, paul.gortmaker, parthasarathy.bhuvaragan, richard.alpe,
ying.xue, maloy, tipc-discussion
In-Reply-To: <1462198956-30181-1-git-send-email-jon.maloy@ericsson.com>
From: Jon Maloy <jon.maloy@ericsson.com>
Date: Mon, 2 May 2016 10:22:33 -0400
> The socket-level flow control in TIPC has long been due for a major
> overhaul. This series fixes this.
Series applied, thanks Jon.
^ permalink raw reply
* Re: [PATCH 3/3] rtl8152: correct speed testing
From: David Miller @ 2016-05-03 19:49 UTC (permalink / raw)
To: oneukum-IBi9RG/b67k
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1462187174-17180-3-git-send-email-oneukum-IBi9RG/b67k@public.gmane.org>
From: Oliver Neukum <oneukum-IBi9RG/b67k@public.gmane.org>
Date: Mon, 2 May 2016 13:06:14 +0200
> Allow for SS+ USB
>
> Signed-off-by: Oliver Neukum <ONeukum-IBi9RG/b67k@public.gmane.org>
Applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: [PATCH 2/3] usbnet: correct speed testing
From: David Miller @ 2016-05-03 19:49 UTC (permalink / raw)
To: oneukum; +Cc: linux-usb, netdev
In-Reply-To: <1462187174-17180-2-git-send-email-oneukum@suse.com>
From: Oliver Neukum <oneukum@suse.com>
Date: Mon, 2 May 2016 13:06:13 +0200
> Allow for SS+ USB
>
> Signed-off-by: Oliver Neukum <ONeukum@suse.com>
Applied.
^ permalink raw reply
* Re: [PATCH 1/3] brcm80211: correct speed testing
From: David Miller @ 2016-05-03 19:49 UTC (permalink / raw)
To: oneukum; +Cc: linux-usb, netdev
In-Reply-To: <1462187174-17180-1-git-send-email-oneukum@suse.com>
From: Oliver Neukum <oneukum@suse.com>
Date: Mon, 2 May 2016 13:06:12 +0200
> Allow for SS+ USB
>
> Signed-off-by: Oliver Neukum <ONeukum@suse.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next 1/1] qed: Apply tunnel configurations after PF start
From: David Miller @ 2016-05-03 19:48 UTC (permalink / raw)
To: manish.chopra; +Cc: netdev, Ariel.Elior, Yuval.Mintz
In-Reply-To: <1462184164-22650-1-git-send-email-manish.chopra@qlogic.com>
From: Manish Chopra <manish.chopra@qlogic.com>
Date: Mon, 2 May 2016 06:16:04 -0400
> Configure and enable various tunnels on the
> adapter after PF start.
>
> This change was missed as a part of
> 'commit 464f664501816ef5fbbc00b8de96f4ae5a1c9325
> ("qed: Add infrastructure support for tunneling")'
>
> Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
> Signed-off-by: Yuval Mintz <yuval.mintz@qlogic.com>
Applied.
^ permalink raw reply
* Re: Cannot use NFS with linux-next 20160429
From: Fabio Estevam @ 2016-05-03 19:37 UTC (permalink / raw)
To: Chuck Lever
Cc: Trond Myklebust, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Linux NFS Mailing List
In-Reply-To: <13CA7D80-3F3D-4D92-9E52-1434BD8047DE-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
Hi Chuck,
On Sun, May 1, 2016 at 4:52 PM, Chuck Lever <chuck.lever-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote:
> Hi Fabio-
>
>> On Apr 29, 2016, at 7:18 PM, Fabio Estevam <festevam-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>>
>> Hi,
>>
>> NFS is not working on a imx6q-sabresd board running linux-next 20160429:
>>
>> [ 15.753317] #0: wm8962-audio
>> [ 15.759437] Root-NFS: no NFS server address
>
> At a glance, that looks like the NFSROOT mount options are
> invalid? First, confirm what is specified on the kernel
> cmdline.
Yes, the kernel command line is correct.
>
> I'm not aware of any recent changes to NFSROOT. Often
> these NFSROOT problems turn out to be related to churn in
> the underlying Ethernet drivers or the generic code that
> handles mounting the root filesystem at boot time.
Today's next shows some different info:
[ 7.606456] #0: wm8962-audio
[ 7.672659] VFS: Mounted root (nfs filesystem) readonly on device 0:14.
[ 7.680860] devtmpfs: mounted
[ 7.685664] Freeing unused kernel memory: 1024K (c0c00000 - c0d00000)
[ 7.871481]
[ 7.873004] =================================
[ 7.877381] [ INFO: inconsistent lock state ]
[ 7.881760] 4.6.0-rc6-next-20160503-00002-g51d9962 #351 Not tainted
[ 7.888043] ---------------------------------
[ 7.892419] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage.
[ 7.898449] kworker/0:1H/179 [HC0[0]:SC0[0]:HE1:SE1] takes:
[ 7.904040] (&syncp->seq#5){+.?...}, at: [<c0752328>] tcp_ack+0x134/0x129c
[ 7.911166] {IN-SOFTIRQ-W} state was registered at:
[ 7.916061] [<c016cc68>] lock_acquire+0x78/0x98
[ 7.920816] [<c074ccbc>] tcp_snd_una_update+0x64/0xa8
[ 7.926092] [<c0752328>] tcp_ack+0x134/0x129c
[ 7.930668] [<c0755de8>] tcp_rcv_state_process+0x814/0xfc8
[ 7.936375] [<c075e800>] tcp_v4_do_rcv+0x64/0x1c8
[ 7.941305] [<c07616c8>] tcp_v4_rcv+0xf00/0xfbc
[ 7.946057] [<c07374cc>] ip_local_deliver_finish+0xd4/0x550
[ 7.951859] [<c0737bc4>] ip_local_deliver+0xcc/0xdc
[ 7.956957] [<c0736d78>] ip_rcv_finish+0xc4/0x744
[ 7.961881] [<c073809c>] ip_rcv+0x4c8/0x7a8
[ 7.966284] [<c06fa448>] __netif_receive_skb_core+0x514/0x8ec
[ 7.972251] [<c06ff854>] __netif_receive_skb+0x2c/0x8c
[ 7.977614] [<c06ffb50>] netif_receive_skb_internal+0x7c/0x1f0
[ 7.983666] [<c0700e38>] napi_gro_receive+0x88/0xdc
[ 7.988764] [<c058fb4c>] fec_enet_rx_napi+0x390/0x9c8
[ 7.994036] [<c0700724>] net_rx_action+0x148/0x344
[ 7.999046] [<c012996c>] __do_softirq+0x130/0x2bc
[ 8.003976] [<c0129e40>] irq_exit+0xc4/0x138
[ 8.008466] [<c0177920>] __handle_domain_irq+0x74/0xe4
[ 8.013838] [<c01015d8>] gic_handle_irq+0x4c/0x9c
[ 8.018763] [<c010c4b8>] __irq_svc+0x58/0x78
[ 8.023251] [<c08f7db8>] _raw_spin_unlock_irq+0x30/0x34
[ 8.028710] [<c014a03c>] finish_task_switch+0xcc/0x274
[ 8.034072] [<c08f2728>] __schedule+0x23c/0x6f8
[ 8.038823] [<c08f2d0c>] schedule+0x3c/0xa0
[ 8.043224] [<c08f2f74>] schedule_preempt_disabled+0x10/0x14
[ 8.049103] [<c01663b0>] cpu_startup_entry+0x1f4/0x24c
[ 8.054468] [<c08f070c>] rest_init+0x12c/0x16c
[ 8.059130] [<c0c00cbc>] start_kernel+0x340/0x3b0
[ 8.064059] [<1000807c>] 0x1000807c
[ 8.067767] irq event stamp: 3601
[ 8.071099] hardirqs last enabled at (3601): [<c08f7d74>]
_raw_spin_unlock_irqrestore+0x38/0x4c
[ 8.079936] hardirqs last disabled at (3600): [<c08f7728>]
_raw_spin_lock_irqsave+0x24/0x54
[ 8.088336] softirqs last enabled at (3598): [<c06e9754>]
__release_sock+0x3c/0x124
[ 8.096128] softirqs last disabled at (3596): [<c06e985c>]
release_sock+0x20/0xa4
[ 8.103654]
[ 8.103654] other info that might help us debug this:
[ 8.110202] Possible unsafe locking scenario:
[ 8.110202]
[ 8.116140] CPU0
[ 8.118601] ----
[ 8.121062] lock(&syncp->seq#5);
[ 8.124547] <Interrupt>
[ 8.127182] lock(&syncp->seq#5);
[ 8.130838]
[ 8.130838] *** DEADLOCK ***
[ 8.130838]
[ 8.136785] 3 locks held by kworker/0:1H/179:
[ 8.141157] #0: ("rpciod"){.+.+.+}, at: [<c013e478>]
process_one_work+0x128/0x410
[ 8.148965] #1: ((&task->u.tk_work)){+.+.+.}, at: [<c013e478>]
process_one_work+0x128/0x410
[ 8.157630] #2: (sk_lock-AF_INET-RPC){+.+...}, at: [<c074af70>]
tcp_sendmsg+0x24/0xb5c
[ 8.165859]
[ 8.165859] stack backtrace:
[ 8.170247] CPU: 0 PID: 179 Comm: kworker/0:1H Not tainted
4.6.0-rc6-next-20160503-00002-g51d9962 #351
[ 8.179572] Hardware name: Freescale i.MX6 Quad/DualLite (Device Tree)
[ 8.186137] Workqueue: rpciod rpc_async_schedule
[ 8.190791] Backtrace:
[ 8.193307] [<c010b6f8>] (dump_backtrace) from [<c010b894>]
(show_stack+0x18/0x1c)
[ 8.200894] r6:60000193 r5:ffffffff r4:00000000 r3:eebdc800
[ 8.206692] [<c010b87c>] (show_stack) from [<c03dfbf4>]
(dump_stack+0xb0/0xe8)
[ 8.213961] [<c03dfb44>] (dump_stack) from [<c01c72d4>]
(print_usage_bug+0x268/0x2dc)
[ 8.221809] r8:00000004 r7:eebdcd00 r6:eebdc800 r5:c0ae4bbc
r4:c0ec6054 r3:eebdc800
[ 8.229712] [<c01c706c>] (print_usage_bug) from [<c016ace0>]
(mark_lock+0x29c/0x6b0)
[ 8.237472] r10:c016a1c8 r8:00000004 r7:eebdc800 r6:00001054
r5:eebdcd00 r4:00000006
[ 8.245456] [<c016aa44>] (mark_lock) from [<c016b644>]
(__lock_acquire+0x550/0x17c8)
[ 8.253216] r10:c0d21d9c r9:000002be r8:c0e97784 r7:eebdc800
r6:c153a09c r5:eebdcd00
[ 8.261188] r4:00000003 r3:00000001
[ 8.264837] [<c016b0f4>] (__lock_acquire) from [<c016cc68>]
(lock_acquire+0x78/0x98)
[ 8.272598] r10:00000001 r9:c0752328 r8:2d738f6b r7:00000001
r6:c0752328 r5:60000113
[ 8.280568] r4:00000000
[ 8.283155] [<c016cbf0>] (lock_acquire) from [<c074ccbc>]
(tcp_snd_una_update+0x64/0xa8)
[ 8.291261] r7:00000000 r6:ee6b9500 r5:ee6b9500 r4:ee6b99cc
[ 8.297050] [<c074cc58>] (tcp_snd_una_update) from [<c0752328>]
(tcp_ack+0x134/0x129c)
[ 8.304984] r10:ee6b9570 r9:ee42f9c0 r8:2d738f6b r7:c0d02100
r6:00000002 r5:ee6b9500
[ 8.312956] r4:00000002
[ 8.315542] [<c07521f4>] (tcp_ack) from [<c0754c08>]
(tcp_rcv_established+0x140/0x774)
[ 8.323477] r10:ee6b9570 r9:ee42f9c0 r8:c0d6bfb3 r7:c155a080
r6:ee6e9a62 r5:ee42f9c0
[ 8.331448] r4:ee6b9500
[ 8.334039] [<c0754ac8>] (tcp_rcv_established) from [<c075e8fc>]
(tcp_v4_do_rcv+0x160/0x1c8)
[ 8.342494] r8:c0d6bfb3 r7:c155a080 r6:eea79600 r5:ee6b9500 r4:ee42f9c0
[ 8.349348] [<c075e79c>] (tcp_v4_do_rcv) from [<c06e97ac>]
(__release_sock+0x94/0x124)
[ 8.357281] r6:00000000 r5:ee6b9500 r4:00000000 r3:c075e79c
[ 8.363065] [<c06e9718>] (__release_sock) from [<c06e9870>]
(release_sock+0x34/0xa4)
[ 8.370825] r10:ee6b9500 r9:ee6c1ce4 r8:00000000 r7:00000080
r6:c074b1f0 r5:ee6b9570
[ 8.378797] r4:ee6b9500 r3:ee42f9c0
[ 8.382448] [<c06e983c>] (release_sock) from [<c074b1f0>]
(tcp_sendmsg+0x2a4/0xb5c)
[ 8.390122] r6:00000080 r5:ee6b9500 r4:ee6c2000 r3:00000015
[ 8.395922] [<c074af4c>] (tcp_sendmsg) from [<c077a824>]
(inet_sendmsg+0x128/0x200)
[ 8.403596] r10:c0d6c136 r9:ee6a4000 r8:ee6c1ce4 r7:00000080
r6:00000000 r5:c0d6c136
[ 8.411565] r4:ee6b9500
[ 8.414161] [<c077a6fc>] (inet_sendmsg) from [<c06e41ec>]
(sock_sendmsg+0x1c/0x2c)
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ 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