1. 25 7月, 2014 5 次提交
    • D
      Merge branch 'net_next_ovs' of git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch · 92390790
      David S. Miller 提交于
      Pravin B Shelar says:
      
      ====================
      Open vSwitch
      
      Following patches adds three features to OVS
      1. Add fairness to upcall processing.
      2. Hash action.
      3. Enable Tunnel GSO features.
      Rest of patches are bug fixes related to patches from same series.
      
      v2 series changes first patch according to comment from Dave Miller.
      v3 series changes first patch according to comment from Nikolay Aleksandrov.
      v4 series update recirc patch commit msg.
      v5 series resolve conflict with net-next, updated recic action patch.
      v6 series sends all patches.
      v7 series drop recirc patches.
      v8 series checkpatch fix
      v9 series drop HASH action patch. update sample action commit msg.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      92390790
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 10f29808
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2014-07-24
      
      This series contains updates to igb, ixgbe, i40e and i40evf.
      
      Mark fixes a possible attempt to dereference a NULL pointer in ixgbe_probe().
      Also changes some uses of strncpy to strlcpy when clearing is not needed to
      prevent information leakage.
      
      Jacob fixes a bug in the misuse of the list_for_each macro to loop over
      every entry in the bus_list.  Instead of attempting to loop over the list
      from a random entry point, go up to the bus and use the real list_head
      entry point.  This prevents the possible read or write of unallocated or
      incorrectly addressed memory.  Then provides a patch to prevent the
      display of the minimum link qualification check if we might be in a
      virtual machine.  This check is incorrect and misleading in this case,
      since we actually do not really know what the available bandwidth is.
      To do so, we simply check whether each function on the bus matches our
      device id.
      
      Carolyn adds a check and prints the error cause register value when the
      hardware detects a malformed packet to assist the user.
      
      Toralf Förster fixes a format mismatch in i40e which was found using
      cppcheck.
      
      Shannon adds nvmupdate support by implementing a state machine intended
      to support the userland tool for updating the device eeprom.
      
      Jesse fixes the extension header checksum logic for IPv6 in i40e and
      i40evf.
      
      Mitch reduces a delay in the i40evf driver where we do not need to
      delay an entire millisecond to get into our critical section.
      
      Kamil fixes an issue where access to the NVM was being blocked until
      a driver reset where a check for NVM related admin queue commands
      would not recognize that such a command was received and would not clear
      nvm_busy flag.
      
      Catherine fixes a couple of firmware API version errors.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      10f29808
    • A
      openvswitch: Add skb_clone NULL check for the sampling action. · d9e0ecb8
      Andy Zhou 提交于
      Fix a bug where skb_clone() NULL check is missing in sample action
      implementation.
      Signed-off-by: NAndy Zhou <azhou@nicira.com>
      Signed-off-by: NPravin B Shelar <pshelar@nicira.com>
      d9e0ecb8
    • S
      openvswitch: Sample action without side effects · 651887b0
      Simon Horman 提交于
      The sample action is rather generic, allowing arbitrary actions to be
      executed based on a probability. However its use, within the Open
      vSwitch
      code-base is limited: only a single user-space action is ever nested.
      
      A consequence of the current implementation of sample actions is that
      depending on weather the sample action executed (due to its probability)
      any side-effects of nested actions may or may not be present before
      executing subsequent actions.  This has the potential to complicate
      verification of valid actions by the (kernel) datapath. And indeed
      adding support for push and pop MPLS actions inside sample actions
      is one case where such case.
      
      In order to allow all supported actions to be continue to be nested
      inside sample actions without the potential need for complex
      verification code this patch changes the implementation of the sample
      action in the kernel datapath so that sample actions are more like
      a function call and any side effects of nested actions are not
      present when executing subsequent actions.
      
      With the above in mind the motivation for this change is twofold:
      
      * To contain side-effects the sample action in the hope of making it
        easier to deal with in the future and;
      * To avoid some rather complex verification code introduced in the MPLS
        datapath patch.
      Signed-off-by: NSimon Horman <horms@verge.net.au>
      Signed-off-by: NJesse Gross <jesse@nicira.com>
      Signed-off-by: NPravin B Shelar <pshelar@nicira.com>
      651887b0
    • A
      openvswitch: Avoid memory corruption in queue_userspace_packet() · f53e3831
      Andy Zhou 提交于
      In queue_userspace_packet(), the ovs_nla_put_flow return value is
      not checked. This is fine as long as key_attr_size() returns the
      correct value. In case it does not, the current code may corrupt buffer
      memory. Add a run time assertion catch this case to avoid silent
      failure.
      Reported-by: NBen Pfaff <blp@nicira.com>
      Signed-off-by: NAndy Zhou <azhou@nicira.com>
      Signed-off-by: NPravin B Shelar <pshelar@nicira.com>
      f53e3831
  2. 24 7月, 2014 32 次提交
  3. 23 7月, 2014 3 次提交