1. 14 5月, 2014 4 次提交
  2. 13 5月, 2014 12 次提交
  3. 12 5月, 2014 7 次提交
  4. 10 5月, 2014 17 次提交
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · 1448eb56
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      pull request: wireless 2014-05-08
      
      This one is all from Johannes:
      
      "Here are a few small fixes for the current cycle: radiotap TX flags were
      wrong (fix by Bob), Chun-Yeow fixes an SMPS issue with mesh interfaces,
      Eliad fixes a locking bug and a cfg80211 state problem and finally
      Henning sent me a fix for IBSS rate information."
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1448eb56
    • D
      Merge branch 'sctp_sysctl' · 05ab2dae
      David S. Miller 提交于
      Wang Weidong says:
      
      ====================
      sctp: fix kfree static array pointer in sctp_sysctl_net_unregister
      
      patch #1 revert the efb842c4("sctp: optimize the sctp_sysctl_net_register")
      patch #2 add a checking for sctp_sysctl_net_register
      ====================
      Acked-by: NNeil Horman <nhorman@tuxdriver.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      05ab2dae
    • W
      sctp: add a checking for sctp_sysctl_net_register · f66138c8
      wangweidong 提交于
      When register_net_sysctl failed, we should free the
      sysctl_table.
      Signed-off-by: NWang Weidong <wangweidong1@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      f66138c8
    • W
      Revert "sctp: optimize the sctp_sysctl_net_register" · eb9f3705
      wangweidong 提交于
      This revert commit efb842c4("sctp: optimize the sctp_sysctl_net_register"),
      Since it doesn't kmemdup a sysctl_table for init_net, so the
      init_net->sctp.sysctl_header->ctl_table_arg points to sctp_net_table
      which is a static array pointer. So when doing sctp_sysctl_net_unregister,
      it will free sctp_net_table, then we will get a NULL pointer dereference
      like that:
      
      [  262.948220] BUG: unable to handle kernel NULL pointer dereference at 000000000000006c
      [  262.948232] IP: [<ffffffff81144b70>] kfree+0x80/0x420
      [  262.948260] PGD db80a067 PUD dae12067 PMD 0
      [  262.948268] Oops: 0000 [#1] SMP
      [  262.948273] Modules linked in: sctp(-) crc32c_generic libcrc32c
      ...
      [  262.948338] task: ffff8800db830190 ti: ffff8800dad00000 task.ti: ffff8800dad00000
      [  262.948344] RIP: 0010:[<ffffffff81144b70>]  [<ffffffff81144b70>] kfree+0x80/0x420
      [  262.948353] RSP: 0018:ffff8800dad01d88  EFLAGS: 00010046
      [  262.948358] RAX: 0100000000000000 RBX: ffffffffa0227940 RCX: ffffea0000707888
      [  262.948363] RDX: ffffea0000707888 RSI: 0000000000000001 RDI: ffffffffa0227940
      [  262.948369] RBP: ffff8800dad01de8 R08: 0000000000000000 R09: ffff8800d9e983a9
      [  262.948374] R10: 0000000000000000 R11: 0000000000000000 R12: ffffffffa0227940
      [  262.948380] R13: ffffffff8187cfc0 R14: 0000000000000000 R15: ffffffff8187da10
      [  262.948386] FS:  00007fa2a2658700(0000) GS:ffff880112800000(0000) knlGS:0000000000000000
      [  262.948394] CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
      [  262.948400] CR2: 000000000000006c CR3: 00000000cddc0000 CR4: 00000000000006e0
      [  262.948410] Stack:
      [  262.948413]  ffff8800dad01da8 0000000000000286 0000000020227940 ffffffffa0227940
      [  262.948422]  ffff8800dad01dd8 ffffffff811b7fa1 ffffffffa0227940 ffffffffa0227940
      [  262.948431]  ffffffff8187d960 ffffffff8187cfc0 ffffffff8187d960 ffffffff8187da10
      [  262.948440] Call Trace:
      [  262.948457]  [<ffffffff811b7fa1>] ? unregister_sysctl_table+0x51/0xa0
      [  262.948476]  [<ffffffffa020d1a1>] sctp_sysctl_net_unregister+0x21/0x30 [sctp]
      [  262.948490]  [<ffffffffa020ef6d>] sctp_net_exit+0x12d/0x150 [sctp]
      [  262.948512]  [<ffffffff81394f49>] ops_exit_list+0x39/0x60
      [  262.948522]  [<ffffffff813951ed>] unregister_pernet_operations+0x3d/0x70
      [  262.948530]  [<ffffffff81395292>] unregister_pernet_subsys+0x22/0x40
      [  262.948544]  [<ffffffffa020efcc>] sctp_exit+0x3c/0x12d [sctp]
      [  262.948562]  [<ffffffff810c5e04>] SyS_delete_module+0x194/0x210
      [  262.948577]  [<ffffffff81240fde>] ? trace_hardirqs_on_thunk+0x3a/0x3f
      [  262.948587]  [<ffffffff815217a2>] system_call_fastpath+0x16/0x1b
      
      With this revert, it won't occur the Oops.
      Signed-off-by: NWang Weidong <wangweidong1@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      eb9f3705
    • A
      mdio_bus: fix devm_mdiobus_alloc_size export · 93dccc59
      Arnd Bergmann 提交于
      commit 6d48f44b "mdio_bus: implement devm_mdiobus_alloc/devm_mdiobus_free"
      introduced a new function devm_mdiobus_alloc_size() but added an export
      for a different function devm_mdiobus_alloc(), which was obviously
      a simple mistake that leads to  build error whenever this function is
      used from a loadable module:
      
      ERROR: "devm_mdiobus_alloc_size" [drivers/net/ethernet/ti/davinci_mdio.ko] undefined!
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Cc: Grygorii Strashko <grygorii.strashko@ti.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
      Cc: Lad, Prabhakar <prabhakar.csengg@gmail.com>
      Cc: David S. Miller <davem@davemloft.net>
      Cc: netdev@vger.kernel.org
      Acked-by: NLad, Prabhakar <prabhakar.csengg@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      93dccc59
    • E
      net: cassini: use nested lock annotation · a9de0500
      Emil Goode 提交于
      In the cas_lock_tx function we acquire multiple locks in a loop and
      need to use nested lock annotation to prevent lockdep warnings.
      Reported-by: NMeelis Roos <mroos@linux.ee>
      Signed-off-by: NEmil Goode <emilgoode@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a9de0500
    • N
      bonding: make a generic sysfs option store and fix comments · dc3e5d18
      Nikolay Aleksandrov 提交于
      Introduce a generic option store function for sysfs and remove the
      specific ones. The attribute name is used to match against the option
      which is to be set.
      Also adjust the "name" of tlb_dynamic_lb option to match the sysfs
      entry and fix the comments and comment style in bond_sysfs.c
      The comments which showed obvious behaviour (i.e. behaviour that's seen
      in the option's entry) are removed, the ones that explained important
      points about the setting function have been moved above the respective
      set function in bond_options.c
      
      There's only 1 exception: num_unsol_na/num_grat_arp since it has 2 names
      
      CC: Jay Vosburgh <j.vosburgh@gmail.com>
      CC: Veaceslav Falico <vfalico@gmail.com>
      CC: Andy Gospodarek <andy@greyhouse.net>
      CC: David S. Miller <davem@davemloft.net>
      Signed-off-by: NNikolay Aleksandrov <nikolay@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      dc3e5d18
    • Y
      bnx2x: Fix UNDI driver unload · de682941
      Yuval Mintz 提交于
      Commit 91ebb928b "bnx2x: Add support for Multi-Function UNDI" contains a bug
      which prevent the emptying of the device's Rx buffers before reset.
      As a result, on new boards it is likely HW will reach some fatal assertion
      once its interfaces load after UNDI was previously loaded.
      Signed-off-by: NYuval Mintz <Yuval.Mintz@qlogic.com>
      Signed-off-by: NAriel Elior <Ariel.Elior@qlogic.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      de682941
    • W
      rds: remove the unneed NULL checking · be7faf71
      wangweidong 提交于
      unregister_net_sysctl_table will check the ctl_table_header,
      so remove the unneed checking
      Signed-off-by: NWang Weidong <wangweidong1@huawei.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      be7faf71
    • D
      Merge branch 'mdio_net' · 27653053
      David S. Miller 提交于
      Johan Hovold says:
      
      ====================
      net: cpsw and mdio-gpio fixes for v3.15-final
      
      These patches against v3.15-rc4 fix a few issues in the cpsw and
      mdio-gpio drivers.
      
      Resend with proper stable CC (git send-email still fails to parse the
      
      Sorry about the noise.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      27653053
    • J
      net: cpsw: add missing of_node_put · 60e71ab5
      Johan Hovold 提交于
      Add missing of_node_put to avoid kref leak.
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      60e71ab5
    • J
      net: cpsw: fix null dereference at probe · 6954cc1f
      Johan Hovold 提交于
      Fix null-pointer dereference at probe when the mdio platform device is
      missing (e.g. when it has been disabled in DT).
      
      Cc: stable <stable@vger.kernel.org>	# v3.8
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6954cc1f
    • J
      Revert "net: eth: cpsw: Correctly attach to GPIO bitbang MDIO driver" · 59993f48
      Johan Hovold 提交于
      This reverts commit f8d56d8f ("net:
       eth: cpsw: Correctly attach to GPIO bitbang MDIO driver").
      
      Fix potential null-pointer dereference at probe if the mdio-gpio device
      has not been successfully probed yet.
      
      The offending commit is plain wrong for a number of reasons. First of
      all it accesses internal driver data of an unrelated device. Neither
      does it check that the data is non-null (which it is in case the device
      has not been probed yet).
      
      Furthermore, the decision on whether to treat any driver data according
      to the mdio-gpio driver's internals is made based on the node name. But
      the name is not compared against "mdio" which is the normal name for the
      node, but rather against "gpio" which the node does not have to be named
      (and shouldn't be according to the binding documentation). [ If this
      hack is to be kept out-of-tree it should at least be matching against
      the compatible property. ]
      
      Cc: Stefan Roese <sr@denx.de>
      Cc: stable <stable@vger.kernel.org>	# v3.14
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      59993f48
    • J
      net: mdio-gpio: warn about missing bus alias id · 7f52da56
      Johan Hovold 提交于
      Use a sane default bus id (rather than -ENODEV) and print a warning when
      the bus alias id is missing.
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7f52da56
    • J
      net: mdio-gpio: fix device-tree binding documentation · 0953f789
      Johan Hovold 提交于
      Fix aliases syntax in device-tree binding example to avoid
      copy-paste errors (the alias would be dropped silently).
      Signed-off-by: NJohan Hovold <jhovold@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0953f789
    • B
      net: cdc_mbim: handle unaccelerated VLAN tagged frames · 6b5eeb7f
      Bjørn Mork 提交于
      This driver maps 802.1q VLANs to MBIM sessions. The mapping is based on
      a bogus assumption that all tagged frames will use the acceleration API
      because we enable NETIF_F_HW_VLAN_CTAG_TX. This fails for e.g. frames
      tagged in userspace using packet sockets. Such frames will erroneously
      be considered as untagged and silently dropped based on not being IP.
      
      Fix by falling back to looking into the ethernet header for a tag if no
      accelerated tag was found.
      
      Fixes: a82c7ce5 ("net: cdc_ncm: map MBIM IPS SessionID to VLAN ID")
      Cc: Greg Suarez <gsuarez@smithmicro.com>
      Signed-off-by: NBjørn Mork <bjorn@mork.no>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6b5eeb7f
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · b3d40566
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter fixes for net
      
      The following batch contains netfilter fixes for your net tree, they are:
      
      1) Fix use after free in nfnetlink when sending a batch for some
         unsupported subsystem, from Denys Fedoryshchenko.
      
      2) Skip autoload of the nat module if no binding is specified via
         ctnetlink, from Florian Westphal.
      
      3) Set local_df after netfilter defragmentation to avoid a bogus ICMP
         fragmentation needed in the forwarding path, also from Florian.
      
      4) Fix potential user after free in ip6_route_me_harder() when returning
         the error code to the upper layers, from Sergey Popovich.
      
      5) Skip possible bogus ICMP time exceeded emitted from the router (not
         valid according to RFC) if conntrack zones are used, from Vasily Averin.
      
      6) Fix fragment handling when nf_defrag_ipv4 is loaded but nf_conntrack
         is not present, also from Vasily.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b3d40566