diff options
author | smitsohu <smitsohu@gmail.com> | 2018-08-19 21:07:10 +0200 |
---|---|---|
committer | smitsohu <smitsohu@gmail.com> | 2018-08-19 21:07:10 +0200 |
commit | ee3fa54523e7bb29b4230a884d3df4ec07f69577 (patch) | |
tree | 2df729b7c0fefcbbbe637caa6245601fdaf948da /src/firejail/util.c | |
parent | qutebrowser.profile: noblacklist /usr/lib/llvm (diff) | |
download | firejail-ee3fa54523e7bb29b4230a884d3df4ec07f69577.tar.gz firejail-ee3fa54523e7bb29b4230a884d3df4ec07f69577.tar.zst firejail-ee3fa54523e7bb29b4230a884d3df4ec07f69577.zip |
fix pid_get_uid for the root user
Diffstat (limited to 'src/firejail/util.c')
-rw-r--r-- | src/firejail/util.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/firejail/util.c b/src/firejail/util.c index 6db92b554..5738e7cf8 100644 --- a/src/firejail/util.c +++ b/src/firejail/util.c | |||
@@ -795,12 +795,14 @@ uid_t pid_get_uid(pid_t pid) { | |||
795 | char buf[PIDS_BUFLEN]; | 795 | char buf[PIDS_BUFLEN]; |
796 | while (fgets(buf, PIDS_BUFLEN - 1, fp)) { | 796 | while (fgets(buf, PIDS_BUFLEN - 1, fp)) { |
797 | if (strncmp(buf, "Uid:", 4) == 0) { | 797 | if (strncmp(buf, "Uid:", 4) == 0) { |
798 | char *ptr = buf + 5; | 798 | char *ptr = buf + 4; |
799 | while (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t')) { | 799 | while (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t')) { |
800 | ptr++; | 800 | ptr++; |
801 | } | 801 | } |
802 | if (*ptr == '\0') | 802 | if (*ptr == '\0') { |
803 | break; | 803 | fprintf(stderr, "Error: cannot read /proc file\n"); |
804 | exit(1); | ||
805 | } | ||
804 | 806 | ||
805 | rv = atoi(ptr); | 807 | rv = atoi(ptr); |
806 | break; // break regardless! | 808 | break; // break regardless! |
@@ -811,10 +813,6 @@ uid_t pid_get_uid(pid_t pid) { | |||
811 | free(file); | 813 | free(file); |
812 | EUID_USER(); // grsecurity fix | 814 | EUID_USER(); // grsecurity fix |
813 | 815 | ||
814 | if (rv == 0) { | ||
815 | fprintf(stderr, "Error: cannot read /proc file\n"); | ||
816 | exit(1); | ||
817 | } | ||
818 | return rv; | 816 | return rv; |
819 | } | 817 | } |
820 | 818 | ||