Skip to content

fix: validate DBus reply in SMB mount path #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Johnson-zs wants to merge 1 commit into from
Closed

fix: validate DBus reply in SMB mount path #413

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/dfm-mount/private/dnetworkmounter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,19 @@ DNetworkMounter::MountRet DNetworkMounter::mountWithUserInput(const QString &add
QDBusInterface mntCtrl(kDaemonService, kMountControlPath, kMountControlIFace,
QDBusConnection::systemBus());

mntCtrl.setTimeout(60000);
QDBusReply<QVariantMap> ret = mntCtrl.call(kMountControlMount, address, param);
if (!ret.isValid()) {
const auto &e = ret.error();
const QString name = e.name();
if (e.type() == QDBusError::NoReply || name == QStringLiteral("org.freedesktop.DBus.Error.NoReply")) {
QString checkMpt;
if (isMounted(address, checkMpt))
return { true, DeviceError::kNoError, checkMpt };
return { false, DeviceError::kGDBusErrorNoReply, "" };
}
return { false, DeviceError::kGDBusErrorNoReply, "" };
}
auto mntRet = ret.value();
QString mpt = mntRet.value(kDaemonMountRetKeyMpt).toString();
int errNum = mntRet.value(kDaemonMountRetKeyErrno).toInt();
Expand Down Expand Up @@ -639,6 +651,17 @@ DNetworkMounter::MountRet DNetworkMounter::mountWithSavedInfos(const QString &ad
{ kMountFsType, "cifs" } };

QDBusReply<QVariantMap> ret = mntCtrl.call(kMountControlMount, address, param);
if (!ret.isValid()) {
const auto &e = ret.error();
const QString name = e.name();
if (e.type() == QDBusError::NoReply || name == QStringLiteral("org.freedesktop.DBus.Error.NoReply")) {
QString checkMpt;
if (isMounted(address, checkMpt))
return { true, DeviceError::kNoError, checkMpt };
break;
}
break;
}
auto mntRet = ret.value();
QString mpt = mntRet.value(kDaemonMountRetKeyMpt).toString();

Expand Down
Loading