Attachment 158482 Details for Bug 246681 – epipe_octals

[patch] epipe_octals

oddjob-0.27-1-epipe_octals.patch (text/plain), 1.41 KB, created by Jose Plans on 2007-07-03 22:18:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jose Plans

Created: 2007-07-03 22:18:41 UTC

Size: 1.41 KB

patch

obsolete

>--- oddjob-0.27-1/src/mkhomedir.c.epipe_octals	2006-04-05 23:44:37.000000000 +0100
>+++ oddjob-0.27-1/src/mkhomedir.c	2007-07-03 18:31:10.000000000 +0100
>@@ -47,6 +47,8 @@
> #include "util.h"
> 
> #define _(_x) _x
>+#define isoctal(c) \
>+        ((c) >= '0' && (c) <= '7')
> 
> #ident "$Id: mkhomedir.c,v 1.10 2006/04/05 22:44:37 nalin Exp $"
> 
>@@ -247,7 +249,8 @@ int
> main(int argc, char **argv)
> {
> 	char **args;
>-	int i, flags = FLAG_POPULATE;
>+	char buf[BUFSIZ];
>+	int i, j, octal = 1, flags = FLAG_POPULATE;
> 
> 	openlog(PACKAGE "-mkhomedir", LOG_PID, LOG_DAEMON);
> 	override_umask = umask(0777);
>@@ -266,9 +269,29 @@ main(int argc, char **argv)
> 			skel_dir = optarg;
> 			break;
> 		case 'u':
>-			override_umask = atoi(optarg);
>+			/* Check if optarg contains valid octals.
>+			   We might just trust strtol() returning 0
>+			   but then, if someone makes a typo we
>+		 	   allow world writeable files. - jmp */
>+
>+			for (j = 0; *(optarg+j); j++)
>+				if (!isoctal (*(optarg+j))) {
>+					octal = 0;
>+					break;
>+				}
>+
>+			if (!octal) {
>+				fgets(buf, sizeof(buf), stdin); /* Prevent EPIPE */
>+				syslog(LOG_ERR, "Invalid value for umask (%s)", optarg);
>+				closelog();
>+				return EINVAL;
>+			}
>+
>+			override_umask = strtol(optarg, NULL, 8);
> 			break;
> 		default:
>+			fgets(buf, sizeof(buf), stdin);	/* Prevent EPIPE */	
>+
> 			fprintf(stderr, "Valid options:\n"
> 				"-n\tDo not populate home directories, "
> 				"just create them.\n"

Actions: View | Diff

Attachments on bug 246681: 158482 | 281471