rpms/procps-ng
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Avoid segfaults when reading zero bytes - file2str (#951391)

Browse Source
This commit is contained in:
Jaromir Capik 2013-04-16 17:18:25 +02:00
parent 6cd5ba705d
commit 61e5068603
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
procps-ng-3.3.7-segv-file2str-read-zero-bytes.patch Normal file
View File

@ -0,0 +1,41 @@
diff --git a/proc/readproc.c b/proc/readproc.c
--- procps-ng-3.3.7.orig/proc/readproc.c 2013-03-25 11:50:21.000000000 +0100
+++ procps-ng-3.3.7/proc/readproc.c 2013-03-26 17:50:54.860228114 +0100
@@ -534,28 +534,32 @@
static int file2str(const char *directory, const char *what, struct utlbuf_s *ub) {
#define readMAX 4096
- #define buffMIN (tot_read + num + 1) // +1 for the '\0' delimiter
+ #define buffMIN (tot_read + num + 1) // +1 for the '\0' delimiter
+ #define buffGRW (30 + (buffMIN * 5) / 4) // grow by more than 25%
char path[PROCPATHLEN], chunk[readMAX];
- int fd, num, tot_read = 0;
+ int fd, num, eof = 0, tot_read = 0;
/* on first use we preallocate a buffer of minimum size to emulate
former 'local static' behavior -- even if this read fails, that
- buffer will likely soon be used for another sudirectory anyway */
+ buffer will likely soon be used for another subdirectory anyway */
if (ub->buf) ub->buf[0] = '\0';
else ub->buf = xcalloc((ub->siz = readMAX));
sprintf(path, "%s/%s", directory, what);
if (-1 == (fd = open(path, O_RDONLY, 0))) return -1;
- while (0 < (num = read(fd, chunk, readMAX))) {
+ while (!eof && 0 < (num = read(fd, chunk, readMAX))) {
if (ub->siz < buffMIN)
- ub->buf = xrealloc(ub->buf, (ub->siz = buffMIN));
+ ub->buf = xrealloc(ub->buf, (ub->siz = buffGRW));
memcpy(ub->buf + tot_read, chunk, num);
tot_read += num;
+ eof = (num < readMAX);
};
ub->buf[tot_read] = '\0';
close(fd);
+ if (unlikely(tot_read < 1)) return -1;
return tot_read;
#undef readMAX
#undef buffMIN
+ #undef buffGRW
}
static char** file2strvec(const char* directory, const char* what) {

7
procps-ng.spec
View File

@ -3,7 +3,7 @@
Summary: System and process monitoring utilities Summary: System and process monitoring utilities
Name: procps-ng Name: procps-ng
Version: 3.3.7 Version: 3.3.7
Release: 2%{?dist} Release: 3%{?dist}
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: Applications/System Group: Applications/System
URL: https://sourceforge.net/projects/procps-ng/ URL: https://sourceforge.net/projects/procps-ng/
@ -11,6 +11,7 @@ URL: https://sourceforge.net/projects/procps-ng/
Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
Patch0: procps-ng-3.3.7-testsuite-reverting-bogus-commit-unix-exp.patch Patch0: procps-ng-3.3.7-testsuite-reverting-bogus-commit-unix-exp.patch
Patch1: procps-ng-3.3.7-segv-file2str-read-zero-bytes.patch
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig Requires(postun): /sbin/ldconfig
@ -67,6 +68,7 @@ System and process monitoring utilities development headers
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
# The following stuff is needed for git archives only # The following stuff is needed for git archives only
@ -129,6 +131,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysctl.d
%{_includedir}/proc %{_includedir}/proc
%changelog %changelog
* Tue Apr 16 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.7-3
- Avoid segfaults when reading zero bytes - file2str (#951391)
* Mon Apr 15 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.7-2 * Mon Apr 15 2013 Jaromir Capik <jcapik@redhat.com> - 3.3.7-2
- Moving libprocps.pc to the devel subpackage (#951726) - Moving libprocps.pc to the devel subpackage (#951726)