|
 |
c22a38 |
diff -up Linux-PAM-1.1.6/modules/pam_mkhomedir/pam_mkhomedir.c.std-noclose Linux-PAM-1.1.6/modules/pam_mkhomedir/pam_mkhomedir.c
|
|
|
c22a38 |
--- Linux-PAM-1.1.6/modules/pam_mkhomedir/pam_mkhomedir.c.std-noclose 2012-08-15 13:08:43.000000000 +0200
|
|
|
c22a38 |
+++ Linux-PAM-1.1.6/modules/pam_mkhomedir/pam_mkhomedir.c 2013-04-24 13:11:14.768817086 +0200
|
|
|
c22a38 |
@@ -35,6 +35,7 @@
|
|
|
c22a38 |
#include <sys/time.h>
|
|
|
c22a38 |
#include <sys/resource.h>
|
|
|
c22a38 |
#include <sys/wait.h>
|
|
|
c22a38 |
+#include <fcntl.h>
|
|
|
c22a38 |
#include <unistd.h>
|
|
|
c22a38 |
#include <pwd.h>
|
|
|
c22a38 |
#include <errno.h>
|
|
|
c22a38 |
@@ -133,13 +134,21 @@ create_homedir (pam_handle_t *pamh, opti
|
|
|
c22a38 |
if (child == 0) {
|
|
|
c22a38 |
int i;
|
|
|
c22a38 |
struct rlimit rlim;
|
|
|
c22a38 |
+ int dummyfds[2];
|
|
|
c22a38 |
static char *envp[] = { NULL };
|
|
|
c22a38 |
char *args[] = { NULL, NULL, NULL, NULL, NULL };
|
|
|
c22a38 |
|
|
|
c22a38 |
+ /* replace std file descriptors with a dummy pipe */
|
|
|
c22a38 |
+ if (pipe2(dummyfds, O_NONBLOCK) == 0) {
|
|
|
c22a38 |
+ dup2(dummyfds[0], STDIN_FILENO);
|
|
|
c22a38 |
+ dup2(dummyfds[1], STDOUT_FILENO);
|
|
|
c22a38 |
+ dup2(dummyfds[1], STDERR_FILENO);
|
|
|
c22a38 |
+ }
|
|
|
c22a38 |
+
|
|
|
c22a38 |
if (getrlimit(RLIMIT_NOFILE, &rlim)==0) {
|
|
|
c22a38 |
if (rlim.rlim_max >= MAX_FD_NO)
|
|
|
c22a38 |
rlim.rlim_max = MAX_FD_NO;
|
|
|
c22a38 |
- for (i=0; i < (int)rlim.rlim_max; i++) {
|
|
|
c22a38 |
+ for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
|
|
|
c22a38 |
close(i);
|
|
|
c22a38 |
}
|
|
|
c22a38 |
}
|
|
|
c22a38 |
diff -up Linux-PAM-1.1.6/modules/pam_unix/pam_unix_acct.c.std-noclose Linux-PAM-1.1.6/modules/pam_unix/pam_unix_acct.c
|
|
|
c22a38 |
--- Linux-PAM-1.1.6/modules/pam_unix/pam_unix_acct.c.std-noclose 2012-08-15 13:08:43.000000000 +0200
|
|
|
c22a38 |
+++ Linux-PAM-1.1.6/modules/pam_unix/pam_unix_acct.c 2013-04-24 13:12:17.105990961 +0200
|
|
|
c22a38 |
@@ -39,6 +39,7 @@
|
|
|
c22a38 |
#include <stdlib.h>
|
|
|
c22a38 |
#include <stdio.h>
|
|
|
c22a38 |
#include <string.h>
|
|
|
c22a38 |
+#include <fcntl.h>
|
|
|
c22a38 |
#include <unistd.h>
|
|
|
c22a38 |
#include <sys/types.h>
|
|
|
c22a38 |
#include <sys/resource.h>
|
|
|
c22a38 |
@@ -100,21 +101,26 @@ int _unix_run_verify_binary(pam_handle_t
|
|
|
c22a38 |
if (child == 0) {
|
|
|
c22a38 |
int i=0;
|
|
|
c22a38 |
struct rlimit rlim;
|
|
|
c22a38 |
+ int dummyfds[2];
|
|
|
c22a38 |
static char *envp[] = { NULL };
|
|
|
c22a38 |
char *args[] = { NULL, NULL, NULL, NULL };
|
|
|
c22a38 |
|
|
|
c22a38 |
/* reopen stdout as pipe */
|
|
|
c22a38 |
dup2(fds[1], STDOUT_FILENO);
|
|
|
c22a38 |
|
|
|
c22a38 |
+ /* replace std file descriptors with a dummy pipe */
|
|
|
c22a38 |
+ if (pipe2(dummyfds, O_NONBLOCK) == 0) {
|
|
|
c22a38 |
+ dup2(dummyfds[0], STDIN_FILENO);
|
|
|
c22a38 |
+ dup2(dummyfds[1], STDERR_FILENO);
|
|
|
c22a38 |
+ }
|
|
|
c22a38 |
+
|
|
|
c22a38 |
/* XXX - should really tidy up PAM here too */
|
|
|
c22a38 |
|
|
|
c22a38 |
if (getrlimit(RLIMIT_NOFILE,&rlim)==0) {
|
|
|
c22a38 |
if (rlim.rlim_max >= MAX_FD_NO)
|
|
|
c22a38 |
rlim.rlim_max = MAX_FD_NO;
|
|
|
c22a38 |
- for (i=0; i < (int)rlim.rlim_max; i++) {
|
|
|
c22a38 |
- if (i != STDOUT_FILENO) {
|
|
|
c22a38 |
- close(i);
|
|
|
c22a38 |
- }
|
|
|
c22a38 |
+ for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
|
|
|
c22a38 |
+ close(i);
|
|
|
c22a38 |
}
|
|
|
c22a38 |
}
|
|
|
c22a38 |
|
|
|
c22a38 |
diff -up Linux-PAM-1.1.6/modules/pam_unix/pam_unix_passwd.c.std-noclose Linux-PAM-1.1.6/modules/pam_unix/pam_unix_passwd.c
|
|
|
c22a38 |
--- Linux-PAM-1.1.6/modules/pam_unix/pam_unix_passwd.c.std-noclose 2012-08-15 13:08:43.000000000 +0200
|
|
|
c22a38 |
+++ Linux-PAM-1.1.6/modules/pam_unix/pam_unix_passwd.c 2013-04-23 17:13:49.047499806 +0200
|
|
|
c22a38 |
@@ -202,6 +202,7 @@ static int _unix_run_update_binary(pam_h
|
|
|
c22a38 |
if (child == 0) {
|
|
|
c22a38 |
int i=0;
|
|
|
c22a38 |
struct rlimit rlim;
|
|
|
c22a38 |
+ int dummyfds[2];
|
|
|
c22a38 |
static char *envp[] = { NULL };
|
|
|
c22a38 |
char *args[] = { NULL, NULL, NULL, NULL, NULL, NULL };
|
|
|
c22a38 |
char buffer[16];
|
|
|
c22a38 |
@@ -211,11 +212,17 @@ static int _unix_run_update_binary(pam_h
|
|
|
c22a38 |
/* reopen stdin as pipe */
|
|
|
c22a38 |
dup2(fds[0], STDIN_FILENO);
|
|
|
c22a38 |
|
|
|
c22a38 |
+ /* replace std file descriptors with a dummy pipe */
|
|
|
c22a38 |
+ if (pipe2(dummyfds, O_NONBLOCK) == 0) {
|
|
|
c22a38 |
+ dup2(dummyfds[1], STDOUT_FILENO);
|
|
|
c22a38 |
+ dup2(dummyfds[1], STDERR_FILENO);
|
|
|
c22a38 |
+ }
|
|
|
c22a38 |
+
|
|
|
c22a38 |
if (getrlimit(RLIMIT_NOFILE,&rlim)==0) {
|
|
|
c22a38 |
if (rlim.rlim_max >= MAX_FD_NO)
|
|
|
c22a38 |
rlim.rlim_max = MAX_FD_NO;
|
|
|
c22a38 |
- for (i=0; i < (int)rlim.rlim_max; i++) {
|
|
|
c22a38 |
- if (i != STDIN_FILENO)
|
|
|
c22a38 |
+ for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
|
|
|
c22a38 |
+ if (i != dummyfds[0])
|
|
|
c22a38 |
close(i);
|
|
|
c22a38 |
}
|
|
|
c22a38 |
}
|
|
|
c22a38 |
diff -up Linux-PAM-1.1.6/modules/pam_unix/support.c.std-noclose Linux-PAM-1.1.6/modules/pam_unix/support.c
|
|
|
c22a38 |
--- Linux-PAM-1.1.6/modules/pam_unix/support.c.std-noclose 2012-08-15 13:08:43.000000000 +0200
|
|
|
c22a38 |
+++ Linux-PAM-1.1.6/modules/pam_unix/support.c 2013-04-24 13:12:42.893064361 +0200
|
|
|
c22a38 |
@@ -5,6 +5,7 @@
|
|
|
c22a38 |
#include "config.h"
|
|
|
c22a38 |
|
|
|
c22a38 |
#include <stdlib.h>
|
|
|
c22a38 |
+#include <fcntl.h>
|
|
|
c22a38 |
#include <unistd.h>
|
|
|
c22a38 |
#include <stdarg.h>
|
|
|
c22a38 |
#include <stdio.h>
|
|
|
c22a38 |
@@ -462,6 +463,7 @@ static int _unix_run_helper_binary(pam_h
|
|
|
c22a38 |
if (child == 0) {
|
|
|
c22a38 |
int i=0;
|
|
|
c22a38 |
struct rlimit rlim;
|
|
|
c22a38 |
+ int dummyfds[2];
|
|
|
c22a38 |
static char *envp[] = { NULL };
|
|
|
c22a38 |
char *args[] = { NULL, NULL, NULL, NULL };
|
|
|
c22a38 |
|
|
|
c22a38 |
@@ -470,11 +472,17 @@ static int _unix_run_helper_binary(pam_h
|
|
|
c22a38 |
/* reopen stdin as pipe */
|
|
|
c22a38 |
dup2(fds[0], STDIN_FILENO);
|
|
|
c22a38 |
|
|
|
c22a38 |
+ /* replace std file descriptors with a dummy pipe */
|
|
|
c22a38 |
+ if (pipe2(dummyfds, O_NONBLOCK) == 0) {
|
|
|
c22a38 |
+ dup2(dummyfds[1], STDOUT_FILENO);
|
|
|
c22a38 |
+ dup2(dummyfds[1], STDERR_FILENO);
|
|
|
c22a38 |
+ }
|
|
|
c22a38 |
+
|
|
|
c22a38 |
if (getrlimit(RLIMIT_NOFILE,&rlim)==0) {
|
|
|
c22a38 |
if (rlim.rlim_max >= MAX_FD_NO)
|
|
|
c22a38 |
rlim.rlim_max = MAX_FD_NO;
|
|
|
c22a38 |
- for (i=0; i < (int)rlim.rlim_max; i++) {
|
|
|
c22a38 |
- if (i != STDIN_FILENO)
|
|
|
c22a38 |
+ for (i = STDERR_FILENO + 1; i < (int)rlim.rlim_max; i++) {
|
|
|
c22a38 |
+ if (i != dummyfds[0])
|
|
|
c22a38 |
close(i);
|
|
|
c22a38 |
}
|
|
|
c22a38 |
}
|