Move set_hw_params() up (sysctl/getrlimit system calls) so tame(2) can be 
called earlier.

Index: sort.c
===================================================================
RCS file: /cvs/src/usr.bin/sort/sort.c,v
retrieving revision 1.79
diff -u -p -r1.79 sort.c
--- sort.c      5 Apr 2015 13:56:04 -0000       1.79
+++ sort.c      5 Sep 2015 16:56:22 -0000
@@ -872,13 +872,14 @@ main(int argc, char *argv[])
        real_outfile = NULL;
        sflag = NULL;
 
+       set_hw_params();
+
        init_tmp_files();
 
        set_signal_handler();
 
        atexit(clear_tmp_files);
 
-       set_hw_params();
        set_locale();
        set_tmpdir();
        set_sort_opts();

Note: I had some success testing the following sort(1) diff with tame(2):

RCS file: /cvs/src/usr.bin/sort/sort.c,v
retrieving revision 1.79
diff -u -p -r1.79 sort.c
--- sort.c      5 Apr 2015 13:56:04 -0000       1.79
+++ sort.c      5 Sep 2015 16:14:25 -0000
@@ -872,13 +872,17 @@ main(int argc, char *argv[])
        real_outfile = NULL;
        sflag = NULL;
 
+       set_hw_params();
+
+       if (tame("stdio wpath cpath fattr", NULL) == -1)
+               err(1, "tame");
+
        init_tmp_files();
 
        set_signal_handler();
 
        atexit(clear_tmp_files);
 
-       set_hw_params();
        set_locale();
        set_tmpdir();
        set_sort_opts();

Rob

Reply via email to