selinux December 2011 archive
Main Archive Page > Month Archives  > selinux archives
selinux: Re: [PATCH 1/1] libselinux - get_default_type now sets

Re: [PATCH 1/1] libselinux - get_default_type now sets EINVAL if no entry.

From: Eric Paris <eparis_at_nospam>
Date: Thu Dec 01 2011 - 14:17:54 GMT
To: Richard Haines <richard_c_haines@btinternet.com>

applied to my devel branch

On Sun, Nov 27, 2011 at 11:09 AM, Richard Haines
<richard_c_haines@btinternet.com> wrote:
> get_default_type(3) now returns with errno set to EINVAL if the entry does not exist.
>
> Signed-off-by: Richard Haines <richard_c_haines@btinternet.com>
> ---
> libselinux/src/get_default_type.c | 9 +++++++--
> 1 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/libselinux/src/get_default_type.c b/libselinux/src/get_default_type.c
> index 6fd1681..ca3d291 100644
> --- a/libselinux/src/get_default_type.c
> +++ b/libselinux/src/get_default_type.c
> @@ -3,6 +3,7 @@
> #include <string.h>
> #include <ctype.h>
> #include "get_default_type_internal.h"
> +#include <errno.h>
>
> static int find_default_type(FILE * fp, const char *role, char **type);
>
> @@ -32,8 +33,10 @@ static int find_default_type(FILE * fp, const char *role, char **type)
>
> len = strlen(role);
> while (!feof_unlocked(fp)) {
> - if (!fgets_unlocked(buf, sizeof buf, fp))
> + if (!fgets_unlocked(buf, sizeof buf, fp)) {
> + errno = EINVAL;
> return -1;
> + }
> if (buf[strlen(buf) - 1])
> buf[strlen(buf) - 1] = 0;
>
> @@ -53,8 +56,10 @@ static int find_default_type(FILE * fp, const char *role, char **type)
> }
> }
>
> - if (!found)
> + if (!found) {
> + errno = EINVAL;
> return -1;
> + }
>
> t = malloc(strlen(buf) - len);
> if (!t)
> --
> 1.7.7.1
>
>
>
>
>
> --
> 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.

-- 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.