1. 01 Apr, 2014 3 commits
    • Daniel Borkmann's avatar
      net: filter: minor: fix kdoc in __sk_run_filter · 01d32f6e
      Daniel Borkmann authored
      This minor patch fixes the following warning when doing
      a `make htmldocs`:
      
        DOCPROC Documentation/DocBook/networking.xml
      Warning(.../net/core/filter.c:135): No description found for parameter 'insn'
      Warning(.../net/core/filter.c:135): Excess function parameter 'fentry' description in '__sk_run_filter'
        HTML    Documentation/DocBook/networking.html
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarDaniel Borkmann <dborkman@redhat.com>
      Cc: Alexei Starovoitov <ast@plumgrid.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      01d32f6e
    • Pablo Neira's avatar
      netlink: don't compare the nul-termination in nla_strcmp · 8b7b9324
      Pablo Neira authored
      nla_strcmp compares the string length plus one, so it's implicitly
      including the nul-termination in the comparison.
      
       int nla_strcmp(const struct nlattr *nla, const char *str)
       {
              int len = strlen(str) + 1;
              ...
                      d = memcmp(nla_data(nla), str, len);
      
      However, if NLA_STRING is used, userspace can send us a string without
      the nul-termination. This is a problem since the string
      comparison will not match as the last byte may be not the
      nul-termination.
      
      Fix this by skipping the comparison of the nul-termination if the
      attribute data is nul-terminated. Suggested by Thomas Graf.
      
      Cc: Florian Westphal <fw@strlen.de>
      Cc: Thomas Graf <tgraf@suug.ch>
      Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8b7b9324
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · ff378ca1
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates
      
      This series contains fixes to e1000e, igb, ixgbe, ixgebvf, i40e and
      i40evf.
      
      David provides a fix for e1000e to resolve an issue where the device is
      capable of transmitting packets but is unable to receive packets until
      a previously introduced workaround is called.
      
      Jakub Kicinski provides PTP fixes for ixgbe, which include removing a
      redundant if clause and make sure we are not generating both a software and
      hardware timestamp.  As well as fix a race condition and leaking skbs
      when multiple transmit rings try to claim time stamping.
      
      Jean Sacren fixes a function declaration in ixgbe which was introduced
      in commit c97506ab ("ixgbe: Add check for FW veto bit").  In addition
      fixes a function header comment in i40e and fixes the error checking
      by binding the check to the pertinent DMA bit mask.
      
      Mark provides several fixes for ixgbe and ixgbevf.  Most notably are fixes
      to resolve namespace issues and fix ECU warnings induced by LER for ixgbe
      and ixgbevf.
      
      Joe Perches fixes up unnecessary casts in i40e and i40evf.
      
      Peter Senna Tschudin fixes igb to use pci_iounmap when the virtual mapping
      was done with pci_iomap.
      ====================# Please enter a commit message to explain why this merge is necessary,
      ff378ca1
  2. 31 Mar, 2014 37 commits