From 504f5f7bddd81d3b02d00255f5ce693352ca836b Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 6 Apr 2017 09:58:25 +0200 Subject: [PATCH] storage/FileInfo, db/simple/Directory: use 64 bit for device/inode An ino_t is usually a 64 bit integer, and some file systems (such as Linux's kernel NFS client) really uses the upper 32 bit. This can lead to false positives in the directory loop detection in FindAncestorLoop(). Increasing these two attributes (in StorageFileInfo and Directory) to 64 bit adds little overhead, but makes the check a lot safer. --- NEWS | 2 ++ src/db/plugins/simple/Directory.hxx | 2 +- src/storage/FileInfo.hxx | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index a7b441c6f..c57c9dca3 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,6 @@ ver 0.20.7 (not yet released) +* database + - simple: fix false positive directory loop detection with NFS ver 0.20.6 (2017/03/10) * input diff --git a/src/db/plugins/simple/Directory.hxx b/src/db/plugins/simple/Directory.hxx index ee720108c..15631a091 100644 --- a/src/db/plugins/simple/Directory.hxx +++ b/src/db/plugins/simple/Directory.hxx @@ -86,7 +86,7 @@ struct Directory { Directory *parent; time_t mtime; - unsigned inode, device; + uint64_t inode, device; std::string path; diff --git a/src/storage/FileInfo.hxx b/src/storage/FileInfo.hxx index a69b47f0d..7a5cdca73 100644 --- a/src/storage/FileInfo.hxx +++ b/src/storage/FileInfo.hxx @@ -48,7 +48,7 @@ struct StorageFileInfo { * Device id and inode number. 0 means unknown / not * applicable. */ - unsigned device, inode; + uint64_t device, inode; constexpr bool IsRegular() const { return type == Type::REGULAR;