Re: svn commit: r305981 - head/usr.bin/cmp

[John Baldwin]

On Monday, September 19, 2016 04:13:00 PM Conrad E. Meyer wrote:
> Author: cem
> Date: Mon Sep 19 16:13:00 2016
> New Revision: 305981
> URL: https://svnweb.freebsd.org/changeset/base/305981
> 
> Log:
>   cmp(1): Capsicumify
>   
>   Reviewed by:allanjude, bapt, oshogbo
>   Sponsored by:   Dell EMC Isilon
>   Differential Revision:  https://reviews.freebsd.org/D7912
> 
> Modified:
>   head/usr.bin/cmp/cmp.c
> 
> Modified: head/usr.bin/cmp/cmp.c
> ==
> --- head/usr.bin/cmp/cmp.cMon Sep 19 16:07:32 2016(r305980)
> +++ head/usr.bin/cmp/cmp.cMon Sep 19 16:13:00 2016(r305981)
> @@ -42,15 +42,18 @@ static char sccsid[] = "@(#)cmp.c 8.3 (B
>  #include 
>  __FBSDID("$FreeBSD$");
>  
> +#include 
>  #include 
>  #include 

Style nit: why is  first?   or  should
be first (from style(9)) then remaining sys/foo.h headers are alphabetically
sorted after that.  Does  have to be before  for 
some
reason?

-- 
John Baldwin
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Re: svn commit: r305981 - head/usr.bin/cmp

[Andrey Chernov]

On 19.09.2016 19:13, Conrad E. Meyer wrote:
> + /*
> +  * Cache NLS data, for strerror, for err(3), before entering capability
> +  * mode.
> +  */
> + (void)catopen("libc", NL_CAT_LOCALE);

This code should be common for all programs which use err(), perror()
etc. since they all should call setlocale() with LC_ALL. If they not do
it, they should be fixed in the same time.


___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

svn commit: r305981 - head/usr.bin/cmp

[Conrad E. Meyer]

Author: cem
Date: Mon Sep 19 16:13:00 2016
New Revision: 305981
URL: https://svnweb.freebsd.org/changeset/base/305981

Log:
  cmp(1): Capsicumify
  
  Reviewed by:  allanjude, bapt, oshogbo
  Sponsored by: Dell EMC Isilon
  Differential Revision:https://reviews.freebsd.org/D7912

Modified:
  head/usr.bin/cmp/cmp.c

Modified: head/usr.bin/cmp/cmp.c
==
--- head/usr.bin/cmp/cmp.c  Mon Sep 19 16:07:32 2016(r305980)
+++ head/usr.bin/cmp/cmp.c  Mon Sep 19 16:13:00 2016(r305981)
@@ -42,15 +42,18 @@ static char sccsid[] = "@(#)cmp.c   8.3 (B
 #include 
 __FBSDID("$FreeBSD$");
 
+#include 
 #include 
 #include 
 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "extern.h"
@@ -66,6 +69,9 @@ main(int argc, char *argv[])
off_t skip1, skip2;
int ch, fd1, fd2, oflag, special;
const char *file1, *file2;
+   cap_rights_t rights;
+   unsigned long cmd;
+   uint32_t fcntls;
 
oflag = O_RDONLY;
while ((ch = getopt(argc, argv, "hlsxz")) != -1)
@@ -146,6 +152,37 @@ main(int argc, char *argv[])
exit(ERR_EXIT);
}
 
+   cap_rights_init(, CAP_FCNTL, CAP_FSTAT, CAP_MMAP_R);
+   if (cap_rights_limit(fd1, ) < 0 && errno != ENOSYS)
+   err(ERR_EXIT, "unable to limit rights for %s", file1);
+   if (cap_rights_limit(fd2, ) < 0 && errno != ENOSYS)
+   err(ERR_EXIT, "unable to limit rights for %s", file2);
+
+   /* Required for fdopen(3). */
+   fcntls = CAP_FCNTL_GETFL;
+   if (cap_fcntls_limit(fd1, fcntls) < 0 && errno != ENOSYS)
+   err(ERR_EXIT, "unable to limit fcntls for %s", file1);
+   if (cap_fcntls_limit(fd2, fcntls) < 0 && errno != ENOSYS)
+   err(ERR_EXIT, "unable to limit fcntls for %s", file2);
+
+   cap_rights_init(, CAP_FSTAT, CAP_WRITE, CAP_IOCTL);
+   if (cap_rights_limit(STDOUT_FILENO, ) < 0 && errno != ENOSYS)
+   err(ERR_EXIT, "unable to limit rights for stdout");
+
+   /* Required for printf(3) via isatty(3). */
+   cmd = TIOCGETA;
+   if (cap_ioctls_limit(STDOUT_FILENO, , 1) < 0 && errno != ENOSYS)
+   err(ERR_EXIT, "unable to limit ioctls for stdout");
+
+   /*
+* Cache NLS data, for strerror, for err(3), before entering capability
+* mode.
+*/
+   (void)catopen("libc", NL_CAT_LOCALE);
+
+   if (cap_enter() < 0 && errno != ENOSYS)
+   err(ERR_EXIT, "unable to enter capability mode");
+
if (!special) {
if (fstat(fd1, )) {
if (!sflag)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"