| Message ID | 20170510180214.16852-15-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, May 10, 2017 at 08:02:12PM +0200, Christoph Hellwig wrote: > This helper was only used by IMA of all things, which would get spurious > errors if CONFIG_BLOCK is disabled. Just opencode the call there. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > [andy: correctly handle error returns from uuid_to_bin] > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > security/integrity/ima/ima_policy.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c > index 4d1178610145..49fbc3e8f012 100644 > --- a/security/integrity/ima/ima_policy.c > +++ b/security/integrity/ima/ima_policy.c > @@ -717,8 +717,9 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) > break; > } > > - uuid_to_bin(args[0].from, (uuid_t *)entry->fsuuid); > - entry->flags |= IMA_FSUUID; > + result = uuid_to_bin(args[0].from, (uuid_t *)&entry->fsuuid); > + if (!result) > + entry->flags |= IMA_FSUUID; This should have been folded into the previous patch..
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 4d1178610145..49fbc3e8f012 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -717,8 +717,9 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry) break; } - uuid_to_bin(args[0].from, (uuid_t *)entry->fsuuid); - entry->flags |= IMA_FSUUID; + result = uuid_to_bin(args[0].from, (uuid_t *)&entry->fsuuid); + if (!result) + entry->flags |= IMA_FSUUID; break; case Opt_uid_gt: case Opt_euid_gt: