lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 01 Mar 2016 23:53:39 +0000 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: <linux-kernel@...r.kernel.org> Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>, <stable@...r.kernel.org>, Christoph Hellwig <hch@....de>, Trond Myklebust <trond.myklebust@...marydata.com> Subject: [PATCH 3.14 122/130] nfs: fix nfs_size_to_loff_t 3.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christoph Hellwig <hch@....de> commit 50ab8ec74a153eb30db26529088bc57dd700b24c upstream. See http: //www.infradead.org/rpr.html X-Evolution-Source: 1451162204.2173.11@...ra.trondhjem.org Content-Transfer-Encoding: 8bit Mime-Version: 1.0 We support OFFSET_MAX just fine, so don't round down below it. Also switch to using min_t to make the helper more readable. Signed-off-by: Christoph Hellwig <hch@....de> Fixes: 433c92379d9c ("NFS: Clean up nfs_size_to_loff_t()") Signed-off-by: Trond Myklebust <trond.myklebust@...marydata.com> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> --- include/linux/nfs_fs.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -580,9 +580,7 @@ static inline int nfs3_proc_setacls(stru static inline loff_t nfs_size_to_loff_t(__u64 size) { - if (size > (__u64) OFFSET_MAX - 1) - return OFFSET_MAX - 1; - return (loff_t) size; + return min_t(u64, size, OFFSET_MAX); } static inline ino_t
Powered by blists - more mailing lists