File sanitize-symlink-name-buffer-size.patch of Package kio.7470

Overview Repositories Revisions Requests Users Attributes Meta

File sanitize-symlink-name-buffer-size.patch of Package kio.7470

From 44512b6acbe6bb1c595e330bef702a0100d7bd4b Mon Sep 17 00:00:00 2001
From: Taro Yamada <archer_ame@yahoo.co.jp>
Date: Sat, 29 Oct 2016 21:00:02 +0200
Subject: Sanitize the symlink name buffer size.

Currently, KIO uses lstat to get the buffersize for readlink.
But in certain situations, it returns an inappropriate value.

For example, "/proc/self" or "/sys/bus/cpu/devices/*" returns
its size is 0, and then readlink fails with EINVAL (so the
link won't be shown in KDE applications). TMSU seems to return
the target's actual filesize instead of the link size,
i.e. the length of the target's filename.

This patch limits the initial buffer size to sane values and
expands the buffer when needed. The behavior is similar to
ls, so it should be compatible with all filesystems.

REVIEW: 129259
BUG: 369275
---
 src/ioslaves/file/file.cpp | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/ioslaves/file/file.cpp b/src/ioslaves/file/file.cpp
index 8b17d31..9728465 100644
--- a/src/ioslaves/file/file.cpp
+++ b/src/ioslaves/file/file.cpp
@@ -786,13 +786,23 @@ bool FileProtocol::createUDSEntry(const QString &filename, const QByteArray &pat
             const QString linkTarget = QFile::symLinkTarget(QFile::decodeName(path));
 #else
             // Use readlink on Unix because symLinkTarget turns relative targets into absolute (#352927)
-            QByteArray linkTargetBuffer;
-            linkTargetBuffer.resize(buff.st_size);
-            const int n = readlink(path.constData(), linkTargetBuffer.data(), buff.st_size);
-            if (n == -1) {
-                qWarning() << "readlink failed!" << path;
-                return false;
+            ssize_t n;
+            const off_t lowerLimit = 1;
+            const off_t upperLimit = 1024;
+            size_t bufferSize = qBound(lowerLimit, buff.st_size , upperLimit);
+            QByteArray linkTargetBuffer(bufferSize, '\0');
+            while (true) {
+                n = readlink(path.constData(), linkTargetBuffer.data(), bufferSize);
+                if (n < 0 && errno != ERANGE) {
+                    qWarning() << "readlink failed!" << path;
+                    return false;
+                } else if (n > 0 && static_cast<size_t>(n) != bufferSize) {
+                    break;
+                }
+                bufferSize *= 2;
+                linkTargetBuffer.resize(bufferSize);
             }
+            linkTargetBuffer.truncate(n);
             const QString linkTarget = QFile::decodeName(linkTargetBuffer);
 #endif
             entry.insert(KIO::UDSEntry::UDS_LINK_DEST, linkTarget);
-- 
cgit v0.11.2

Places

File sanitize-symlink-name-buffer-size.patch of Package kio.7470

Places