From deb2fb7aa410951280a7f9f416662037807f5c86 Mon Sep 17 00:00:00 2001 From: Rafal Krypa Date: Mon, 9 Jul 2012 19:36:34 +0200 Subject: [PATCH] --- yaml --- r: 313619 b: refs/heads/master c: 65ee7f45cf075adcdd6b6ef365f5a5507f1ea5c5 h: refs/heads/master i: 313617: 63508f77ae5d30aaecfb2e5e75017f49bd448e6c 313615: 095d322787d7d842dffa5ac322cfaa9228a96e3e v: v3 --- [refs] | 2 +- trunk/security/smack/smackfs.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c2975c85884f..32f8269a2f13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3518721a8932b2a243f415c374aef020380efc9d +refs/heads/master: 65ee7f45cf075adcdd6b6ef365f5a5507f1ea5c5 diff --git a/trunk/security/smack/smackfs.c b/trunk/security/smack/smackfs.c index 29b760d6b746..d31e6d957c21 100644 --- a/trunk/security/smack/smackfs.c +++ b/trunk/security/smack/smackfs.c @@ -518,6 +518,9 @@ static void smk_rule_show(struct seq_file *s, struct smack_rule *srp, int max) if (strlen(srp->smk_subject) >= max || strlen(srp->smk_object) >= max) return; + if (srp->smk_access == 0) + return; + seq_printf(s, "%s %s", srp->smk_subject, srp->smk_object); seq_putc(s, ' '); @@ -532,8 +535,6 @@ static void smk_rule_show(struct seq_file *s, struct smack_rule *srp, int max) seq_putc(s, 'a'); if (srp->smk_access & MAY_TRANSMUTE) seq_putc(s, 't'); - if (srp->smk_access == 0) - seq_putc(s, '-'); seq_putc(s, '\n'); }