On Saturday, September 26, 2015 12:34:19 AM Rasmus Villemoes wrote: > sprintf returns the number of characters printed (excluding '\0'), so > we can use that and avoid duplicating the length computation. > > Signed-off-by: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx> > --- > security/selinux/ss/services.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) Applied, thank you. I just pushed all five of your patches to the SELinux next branch so they should be included in the next linux-next release. > diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c > index aa2bdcb20848..ebb5eb3c318c 100644 > --- a/security/selinux/ss/services.c > +++ b/security/selinux/ss/services.c > @@ -1218,13 +1218,10 @@ static int context_struct_to_string(struct context > *context, char **scontext, u3 /* > * Copy the user name, role name and type name into the context. > */ > - sprintf(scontextp, "%s:%s:%s", > + scontextp += sprintf(scontextp, "%s:%s:%s", > sym_name(&policydb, SYM_USERS, context->user - 1), > sym_name(&policydb, SYM_ROLES, context->role - 1), > sym_name(&policydb, SYM_TYPES, context->type - 1)); > - scontextp += strlen(sym_name(&policydb, SYM_USERS, context->user - 1)) + > - 1 + strlen(sym_name(&policydb, SYM_ROLES, context->role - 1)) + > - 1 + strlen(sym_name(&policydb, SYM_TYPES, context->type - 1)); > > mls_sid_to_context(context, &scontextp); -- paul moore www.paul-moore.com _______________________________________________ Selinux mailing list Selinux@xxxxxxxxxxxxx To unsubscribe, send email to Selinux-leave@xxxxxxxxxxxxx. To get help, send an email containing "help" to Selinux-request@xxxxxxxxxxxxx.
