Attachment 295779 Details for Bug 430458 – Here is a proposed improved fix I'll send "upstream". Thanks.

[patch] Here is a proposed improved fix I'll send "upstream". Thanks.

null-pointer-access.diff (text/plain), 1.43 KB, created by Andreas Gruenbacher on 2008-02-25 09:25:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Gruenbacher

Created: 2008-02-25 09:25:28 UTC

Size: 1.43 KB

patch

obsolete

>From: Andreas Gruenbacher <agruen@suse.de>
>Subject: Fix NULL pointer access / segmentation fault
>
>When invoked as ``setfacl -- ...'', setfacl segfaults. Reported
>by Peng Haitao; fix based on patches by Peng Haitao and Jiri
>Moskovcak.
>
>Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
>Cc: Jiri Moskovcak <jmoskovc@redhat.com>
>Cc: Peng Haitao <penght@cn.fujitsu.com>
>
>Index: setfacl/setfacl.c
>===================================================================
>RCS file: /cvs/xfs-cmds/acl/setfacl/setfacl.c,v
>retrieving revision 1.22
>diff -u -r1.22 setfacl.c
>--- setfacl/setfacl.c	4 Dec 2007 05:11:38 -0000	1.22
>+++ setfacl/setfacl.c	25 Feb 2008 08:21:06 -0000
>@@ -301,7 +301,7 @@
> 	int which;
> 	int lineno;
> 	int error;
>-	seq_t seq = NULL;
>+	seq_t seq;
> 	int seq_cmd, parse_mode;
> 	
> 	progname = basename(argv[0]);
>@@ -326,6 +326,10 @@
> 	bindtextdomain(PACKAGE, LOCALEDIR);
> 	textdomain(PACKAGE);
> 
>+	seq = seq_init();
>+	if (!seq)
>+		ERRNO_ERROR(1);
>+
> 	while ((opt = getopt_long(argc, argv, cmd_line_options,
> 		                  long_options, NULL)) != -1) {
> 		/* we remember the two REMOVE_ACL commands of the set
>@@ -334,15 +338,12 @@
> 		cmd_t seq_remove_acl_cmd = NULL;
> 
> 		if (opt != '\1' && saw_files) {
>-			if (seq) {
>+			if (seq)
> 				seq_free(seq);
>-				seq = NULL;
>-			}
>-			saw_files = 0;
>-		}
>-		if (seq == NULL) {
>-			if (!(seq = seq_init()))
>+			seq = seq_init();
>+			if (!seq)
> 				ERRNO_ERROR(1);
>+			saw_files = 0;
> 		}
> 
> 		switch (opt) {

Actions: View | Diff

Attachments on bug 430458: 293136 | 293152 | 295779