1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
From 03bcb3d3ff89074a68839b6ebeb8030ef0ee4fd1 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Fri, 11 Sep 2020 11:54:09 +0200
Subject: [PATCH] kio_trash: remove unnecessarily strict permission check
Tested with `chmod 0770 /d/.Trash-1000` (where /d is a mount point),
kio_trash complained about security checks before this commit,
and works with it.
Also tested with a USB key which ends up mounted as
type vfat (rw,nosuid,nodev,relatime,uid=1000,gid=100,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,showexec,utf8,flush,errors=remount-ro,uhelper=udisks2). After kio_trash creates .Trash-1000
it complained about a "strange filesystem", and while this is still true :),
the removal of the code in TrashImpl::initTrashDirectory makes
the trash dir on the USB key usable.
BUG: 76380
FIXED-IN: 5.74
---
src/ioslaves/trash/trashimpl.cpp | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/src/ioslaves/trash/trashimpl.cpp b/src/ioslaves/trash/trashimpl.cpp
index b1ba87a4..9ec7cc7a 100644
--- a/src/ioslaves/trash/trashimpl.cpp
+++ b/src/ioslaves/trash/trashimpl.cpp
@@ -1210,9 +1210,9 @@ QString TrashImpl::trashForMountPoint(const QString &topdir, bool createIfNeeded
const QByteArray trashDir_c = QFile::encodeName(trashDir);
if (QT_LSTAT(trashDir_c.constData(), &buff) == 0) {
if ((buff.st_uid == uid) // must be owned by user
- && (S_ISDIR(buff.st_mode)) // must be a dir
- && (!S_ISLNK(buff.st_mode)) // not a symlink
- && ((buff.st_mode & 0777) == 0700)) { // rwx for user, ------ for group and others
+ && S_ISDIR(buff.st_mode) // must be a dir
+ && !S_ISLNK(buff.st_mode) // not a symlink
+ && ((buff.st_mode & 0700) == 0700)) { // and we need write access to it
if (checkTrashSubdirs(trashDir_c)) {
return trashDir;
@@ -1248,24 +1248,7 @@ bool TrashImpl::initTrashDirectory(const QByteArray &trashDir_c) const
return false;
}
//qCDebug(KIO_TRASH);
- // This trash dir will be useable only if the directory is owned by user.
- // In theory this is the case, but not on e.g. USB keys...
- uid_t uid = getuid();
- QT_STATBUF buff;
- if (QT_LSTAT(trashDir_c.constData(), &buff) != 0) {
- return false; // huh?
- }
- if ((buff.st_uid == uid) // must be owned by user
- && ((buff.st_mode & 0777) == 0700)) { // rwx for user, --- for group and others
-
- return checkTrashSubdirs(trashDir_c);
-
- } else {
- qCWarning(KIO_TRASH) << trashDir_c << "just created, by it doesn't have the right permissions, probably some strange unsupported filesystem";
- ::rmdir(trashDir_c.constData());
- return false;
- }
- return true;
+ return checkTrashSubdirs(trashDir_c);
}
bool TrashImpl::checkTrashSubdirs(const QByteArray &trashDir_c) const
--
GitLab
|
GitWeb
