Fixes for libselinux/matchpathcon

Fixes for libselinux/matchpathcon

[Daniel J Walsh]

[-- Attachment #1: Type: text/plain, Size: 98 bytes --]

Removing trailing / if given to matchpathcon.

If matchpathcon returns ENOENT, we return <<none>>

[-- Attachment #2: matchpathcon.patch --]
[-- Type: text/plain, Size: 825 bytes --]

--- nsalibselinux/utils/matchpathcon.c	2009-03-06 14:41:45.000000000 -0500
+++ libselinux-2.0.79/utils/matchpathcon.c	2009-03-27 10:09:31.000000000 -0400
@@ -22,9 +22,13 @@
 	char *buf;
 	int rc = matchpathcon(path, mode, &buf);
 	if (rc < 0) {
-		fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
-			strerror(errno));
-		return 1;
+		if (errno == ENOENT) {
+			buf=strdup("<<none>>");
+		} else {
+			fprintf(stderr, "matchpathcon(%s) failed: %s\n", path,
+				strerror(errno));
+			return 1;
+		}
 	}
 	if (header)
 		printf("%s\t%s\n", path, buf);
@@ -101,6 +105,11 @@
 	for (i = optind; i < argc; i++) {
 		int mode = 0;
 		struct stat buf;
+		int len = strlen(argv[i]);
+		if (len > 1  && argv[i][len - 1 ] == '/') {
+			argv[i][len - 1 ] = '\0';
+		}
+
 		if (lstat(argv[i], &buf) == 0)
 			mode = buf.st_mode;
 

Re: Fixes for libselinux/matchpathcon

[Chad Sellers]

On 4/1/09 10:19 AM, "Daniel J Walsh" <dwalsh@redhat.com> wrote:
<snip>
> 
> If matchpathcon returns ENOENT, we return <<none>>

matchpathcon doesn't set errno. The underlying selabel functions do, which
is why this works sometimes. Unfortunately, you don't know which of the
underlying functions set errno, so you display <<none>> if any of them set
errno to ENOENT. For instance, if the file_contexts file is missing, the
selabel_open() call sets errno to ENOENT. It would be better to change
matchpathcon() itself (and possibly it's underlying functions like
matchpathcon_init()) to report back errors depending on what failed.

Thanks,
Chad


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.

Re: Fixes for libselinux/matchpathcon

[Daniel J Walsh]

On 05/07/2009 02:18 PM, Chad Sellers wrote:
> On 4/1/09 10:19 AM, "Daniel J Walsh"<dwalsh@redhat.com>  wrote:
> <snip>
>> If matchpathcon returns ENOENT, we return<<none>>
>
> matchpathcon doesn't set errno. The underlying selabel functions do, which
> is why this works sometimes. Unfortunately, you don't know which of the
> underlying functions set errno, so you display<<none>>  if any of them set
> errno to ENOENT. For instance, if the file_contexts file is missing, the
> selabel_open() call sets errno to ENOENT. It would be better to change
> matchpathcon() itself (and possibly it's underlying functions like
> matchpathcon_init()) to report back errors depending on what failed.
>
> Thanks,
> Chad
>
>
> --
> This message was distributed to subscribers of the selinux mailing list.
> If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
> the words "unsubscribe selinux" without quotes as the message.
Patches accepted.

--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.