On 05/23/2017 07:33 AM, Dan Carpenter wrote:
> We can either return PTR_ERR(NULL) or a PTR_ERR(a valid pointer) here.
> Returning NULL is probably not good, but since this happens at boot
> then we are probably already toasted if we were to hit this bug in real
> life. In other words, it seems like a very low severity bug to me.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
yep,
Acked-by: John Johansen <john.johansen@xxxxxxxxxxxxx>
and puled into my tree
>
> diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
> index 4f6ac9dbc65d..18f0d105084d 100644
> --- a/security/apparmor/apparmorfs.c
> +++ b/security/apparmor/apparmorfs.c
> @@ -728,8 +728,10 @@ int __aa_fs_profile_mkdir(struct aa_profile *profile, struct dentry *parent)
> id_len = snprintf(NULL, 0, ".%ld", profile->ns->uniq_id);
>
> profile->dirname = kmalloc(len + id_len + 1, GFP_KERNEL);
> - if (!profile->dirname)
> - goto fail;
> + if (!profile->dirname) {
> + error = -ENOMEM;
> + goto fail2;
> + }
>
> mangle_name(profile->base.name, profile->dirname);
> sprintf(profile->dirname + len, ".%ld", profile->ns->uniq_id++);
>
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
