diff options
| author | stas <stas@FreeBSD.org> | 2009-12-22 05:49:39 +0800 |
|---|---|---|
| committer | stas <stas@FreeBSD.org> | 2009-12-22 05:49:39 +0800 |
| commit | 5bc05604709c819aee02ea4719d30a4ca2ec5f27 (patch) | |
| tree | 6ec59746dfca26c25a19541a34541272c11a4c5a /sysutils/fuser | |
| parent | bffafc1acc07a16641e822501351fcb3b2eeb237 (diff) | |
| download | freebsd-ports-gnome-5bc05604709c819aee02ea4719d30a4ca2ec5f27.tar.gz freebsd-ports-gnome-5bc05604709c819aee02ea4719d30a4ca2ec5f27.tar.zst freebsd-ports-gnome-5bc05604709c819aee02ea4719d30a4ca2ec5f27.zip | |
- Fix build on HEAD.
- Do not allow the user to send signals to arbitrary processes if
setuid binary is used.
PR: ports/141852
Submitted by: Denis Barov <dindin@dindin.ru>
Security: http://www.freebsd.org/ports/portaudit/4d6076fe-ee7a-11de-9cd0-001a926c7637.html
Diffstat (limited to 'sysutils/fuser')
| -rw-r--r-- | sysutils/fuser/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/fuser/files/extra::patch-nfs.c | 10 | ||||
| -rw-r--r-- | sysutils/fuser/files/patch-fuser.c | 35 |
3 files changed, 47 insertions, 2 deletions
diff --git a/sysutils/fuser/Makefile b/sysutils/fuser/Makefile index 5228b1de6cc9..27efa05e810a 100644 --- a/sysutils/fuser/Makefile +++ b/sysutils/fuser/Makefile @@ -7,7 +7,7 @@ PORTNAME= fuser PORTVERSION= 1142334561 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://mbsd.msk.ru/dist/ @@ -32,7 +32,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra::patch-fuser.c \ EXTRA_PATCHES+= ${FILESDIR}/extra::patch-msdosfs.c .endif .if ${OSVERSION} >= 800101 -BROKEN= does not compile on 8.X +EXTRA_PATCHES+= ${FILESDIR}/extra::patch-nfs.c .endif do-install: diff --git a/sysutils/fuser/files/extra::patch-nfs.c b/sysutils/fuser/files/extra::patch-nfs.c new file mode 100644 index 000000000000..f2650881df55 --- /dev/null +++ b/sysutils/fuser/files/extra::patch-nfs.c @@ -0,0 +1,10 @@ +--- nfs.c.orig 2009-12-21 13:33:10.000000000 -0800 ++++ nfs.c 2009-12-21 13:33:22.000000000 -0800 +@@ -44,7 +44,6 @@ + #include <sys/mount.h> + + #include <nfs/nfsproto.h> +-#include <nfs/rpcv2.h> + #include <nfsclient/nfs.h> + #include <nfsclient/nfsnode.h> + diff --git a/sysutils/fuser/files/patch-fuser.c b/sysutils/fuser/files/patch-fuser.c new file mode 100644 index 000000000000..8f4276146dec --- /dev/null +++ b/sysutils/fuser/files/patch-fuser.c @@ -0,0 +1,35 @@ +--- fuser.c.orig 2006-03-14 14:07:08.000000000 +0300 ++++ fuser.c 2009-12-21 22:51:33.000000000 +0300 +@@ -608,6 +608,7 @@ + char *ep; + char *kernimg = NULL; /* We are using curr. sys by default */ + char *mcore = NULL; ++ int retvalue = 0; + + while ((ch = getopt(argc, argv, "C:K:cfkms:u")) != -1) + switch(ch) { +@@ -696,8 +697,13 @@ + if (ufl != 0) { + print_file_info(pinfo->pid, \ + pinfo->uid, ufl); +- if ((flags & KFLAG) != 0) +- (void)kill(pinfo->pid, sig); ++ if ((flags & KFLAG) != 0) { ++ if (geteuid() == getuid() || pinfo->uid == getuid()) { ++ (void)kill(pinfo->pid, sig); ++ } else { ++ retvalue = 1; ++ } ++ } + } + } + (void)fprintf(stderr, "\n"); +@@ -707,7 +713,7 @@ + SLIST_FREE(&prclist, next, pinfo_free); + (void)kvm_close(kd); + +- return 0; ++ return retvalue; + + } + |