Re: [PATCH] libselinux: Correct line count for property and service contexts files

[Stephen Smalley]

On 11/23/2015 08:52 AM, Richard Haines wrote:

When a line number is displayed for context errors they are
x2 the correct value, so reset line count for each pass.

Signed-off-by: Richard Haines <richard_c_hai...@btinternet.com>

Thanks, applied.

---
  libselinux/src/label_android_property.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libselinux/src/label_android_property.c 
b/libselinux/src/label_android_property.c
index 712eecb..fea1f8f 100644
--- a/libselinux/src/label_android_property.c
+++ b/libselinux/src/label_android_property.c
@@ -132,7 +132,7 @@ static int init(struct selabel_handle *rec, const struct 
selinux_opt *opts,
        const char *path = NULL;
        FILE *fp;
        char line_buf[BUFSIZ];
-       unsigned int lineno = 0, maxnspec, pass;
+       unsigned int lineno, maxnspec, pass;
        int status = -1;
        struct stat sb;

@@ -166,6 +166,7 @@ static int init(struct selabel_handle *rec, const struct 
selinux_opt *opts,
        maxnspec = UINT_MAX / sizeof(spec_t);
        for (pass = 0; pass < 2; pass++) {
                data->nspec = 0;
+               lineno = 0;

                while (fgets(line_buf, sizeof(line_buf) - 1, fp)
                       && data->nspec < maxnspec) {

_______________________________________________
Selinux mailing list
Selinux@tycho.nsa.gov
To unsubscribe, send email to selinux-le...@tycho.nsa.gov.
To get help, send an email containing "help" to selinux-requ...@tycho.nsa.gov.