Compare commits

...

1 Commits
master ... f18

Author SHA1 Message Date
Rex Dieter 0bdaebfce4 The kded4 binary slowly grows without limit (#871761, kde#324954) 2013-10-03 08:26:02 -05:00
2 changed files with 48 additions and 1 deletions

View File

@ -0,0 +1,38 @@
From 8791daf6c46e57c3760a564a7dfbe85513aba522 Mon Sep 17 00:00:00 2001
From: "Lamarque V. Souza" <lamarque@kde.org>
Date: Sun, 22 Sep 2013 09:32:24 -0300
Subject: [PATCH 17/17] Do not leak sockets in NetworkInterface::isWireless().
BUG: 324954
REVIEW: 112869
FIXED-IN: 4.11.2
---
solid/solid/backends/udev/udevnetworkinterface.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/solid/solid/backends/udev/udevnetworkinterface.cpp b/solid/solid/backends/udev/udevnetworkinterface.cpp
index 06dc907..cf9c737 100644
--- a/solid/solid/backends/udev/udevnetworkinterface.cpp
+++ b/solid/solid/backends/udev/udevnetworkinterface.cpp
@@ -25,6 +25,7 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
+#include <unistd.h>
#include <linux/if_arp.h>
#include <linux/wireless.h>
@@ -67,8 +68,10 @@ bool NetworkInterface::isWireless() const
QFileInfo phyDir(m_device->deviceName() + "/phy80211");
if ((ioctl (ioctl_fd, SIOCGIWNAME, &iwr) == 0) || phyDir.isDir()) {
+ close(ioctl_fd);
return true;
}
+ close(ioctl_fd);
}
return false;
}
--
1.8.3.1

View File

@ -34,7 +34,7 @@
Summary: KDE Libraries
Version: 4.10.5
Release: 1%{?dist}
Release: 2%{?dist}
Name: kdelibs
Epoch: 6
@ -161,6 +161,10 @@ Patch090: return-not-break.-copy-paste-error.patch
Patch091: coding-style-fixes.patch
Patch092: return-application-icons-properly.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=871761
# https://bugs.kde.org/show_bug.cgi?id=324954
Patch117: 0017-Do-not-leak-sockets-in-NetworkInterface-isWireless.patch
## security fix
# rhel patches
@ -353,6 +357,8 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
%patch091 -p1 -R -b .coding-style-fixes.patch
%patch092 -p1 -R -b .return-application-icons-properly
%patch117 -p1 -b .0017
# security fixes
# rhel patches
@ -593,6 +599,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
%changelog
* Thu Oct 03 2013 Rex Dieter <rdieter@fedoraproject.org> 4.10.5-2
- The kded4 binary slowly grows without limit (#871761, kde#324954)
* Sun Jun 30 2013 Than Ngo <than@redhat.com> - 4.10.5-1
- 4.10.5