On Wed, 22 May 2019, David Howells wrote:

> +
> +     if (flags & ~KEYCTL_MOVE_EXCL)
> +             return -EINVAL;
> +
> +     key_ref = lookup_user_key(id, KEY_LOOKUP_CREATE, KEY_NEED_LINK);
> +     if (IS_ERR(key_ref)) {
> +             ret = PTR_ERR(key_ref);
> +             goto error;
> +     }

This could probably be a simple return, as there is no cleanup.

> +
> +     from_ref = lookup_user_key(from_ringid, 0, KEY_NEED_WRITE);
> +     if (IS_ERR(from_ref)) {
> +             ret = PTR_ERR(from_ref);
> +             goto error2;
> +     }
> +
> +     to_ref = lookup_user_key(to_ringid, KEY_LOOKUP_CREATE, KEY_NEED_WRITE);
> +     if (IS_ERR(to_ref)) {
> +             ret = PTR_ERR(to_ref);
> +             goto error3;
> +     }
> +
> +     ret = key_move(key_ref_to_ptr(key_ref), key_ref_to_ptr(from_ref),
> +                    key_ref_to_ptr(to_ref), flags);
> +
> +     key_ref_put(to_ref);
> +error3:
> +     key_ref_put(from_ref);
> +error2:
> +     key_ref_put(key_ref);
> +error:
> +     return ret;
> +}
> +


-- 
James Morris
<jmor...@namei.org>

Reply via email to