1. 28 Aug, 2019 37 commits
  2. 27 Aug, 2019 3 commits
    • Qian Cai's avatar
      net/mlx5: fix a -Wstringop-truncation warning · bb487d29
      Qian Cai authored
      In file included from ./arch/powerpc/include/asm/paca.h:15,
                       from ./arch/powerpc/include/asm/current.h:13,
                       from ./include/linux/thread_info.h:21,
                       from ./include/asm-generic/preempt.h:5,
                       from ./arch/powerpc/include/generated/asm/preempt.h:1,
                       from ./include/linux/preempt.h:78,
                       from ./include/linux/spinlock.h:51,
                       from ./include/linux/wait.h:9,
                       from ./include/linux/completion.h:12,
                       from ./include/linux/mlx5/driver.h:37,
                       from
      drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h:6,
                       from
      drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c:33:
      In function 'strncpy',
          inlined from 'mlx5_fw_tracer_save_trace' at
      drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c:549:2,
          inlined from 'mlx5_tracer_print_trace' at
      drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c:574:2:
      ./include/linux/string.h:305:9: warning: '__builtin_strncpy' output may
      be truncated copying 256 bytes from a string of length 511
      [-Wstringop-truncation]
        return __builtin_strncpy(p, q, size);
               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      
      Fix it by using the new strscpy_pad() since the commit 458a3bf8
      ("lib/string: Add strscpy_pad() function") which will always
      NUL-terminate the string, and avoid possibly leak data through the ring
      buffer where non-admin account might enable these events through perf.
      
      Fixes: fd1483fe ("net/mlx5: Add support for FW reporter dump")
      Signed-off-by: default avatarQian Cai <cai@lca.pw>
      Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
      bb487d29
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 68aaf445
      David S. Miller authored
      Minor conflict in r8169, bug fix had two versions in net
      and net-next, take the net-next hunks.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      68aaf445
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-5.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 9e8312f5
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights include:
      
        Stable fixes:
      
         - Fix a page lock leak in nfs_pageio_resend()
      
         - Ensure O_DIRECT reports an error if the bytes read/written is 0
      
         - Don't handle errors if the bind/connect succeeded
      
         - Revert "NFSv4/flexfiles: Abort I/O early if the layout segment was
           invalidat ed"
      
        Bugfixes:
      
         - Don't refresh attributes with mounted-on-file information
      
         - Fix return values for nfs4_file_open() and nfs_finish_open()
      
         - Fix pnfs layoutstats reporting of I/O errors
      
         - Don't use soft RPC calls for pNFS/flexfiles I/O, and don't abort
           for soft I/O errors when the user specifies a hard mount.
      
         - Various fixes to the error handling in sunrpc
      
         - Don't report writepage()/writepages() errors twice"
      
      * tag 'nfs-for-5.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS: remove set but not used variable 'mapping'
        NFSv2: Fix write regression
        NFSv2: Fix eof handling
        NFS: Fix writepage(s) error handling to not report errors twice
        NFS: Fix spurious EIO read errors
        pNFS/flexfiles: Don't time out requests on hard mounts
        SUNRPC: Handle connection breakages correctly in call_status()
        Revert "NFSv4/flexfiles: Abort I/O early if the layout segment was invalidated"
        SUNRPC: Handle EADDRINUSE and ENOBUFS correctly
        pNFS/flexfiles: Turn off soft RPC calls
        SUNRPC: Don't handle errors if the bind/connect succeeded
        NFS: On fatal writeback errors, we need to call nfs_inode_remove_request()
        NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup
        NFS: Ensure O_DIRECT reports an error if the bytes read/written is 0
        NFSv4/pnfs: Fix a page lock leak in nfs_pageio_resend()
        NFSv4: Fix return value in nfs_finish_open()
        NFSv4: Fix return values for nfs4_file_open()
        NFS: Don't refresh attributes with mounted-on-file information
      9e8312f5