On Fri, 2010-11-19 at 16:43 +0000, David Howells wrote:
> Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> wrote:
>
> > +static int datablob_format(char __user *buffer,
> > + struct encrypted_key_payload *epayload,
> > + int asciiblob_len)
>
> size_t? There are other instances where you should be using size_t too.
Most of the crypto library calls use "unsigned int". Obviously didn't
quite get everything else. Will look again. thanks.
> > + index = strcspn(epayload->master_desc, ":");
> > + if (index == strlen(epayload->master_desc))
> > + goto out;
>
> For single chars, use strchr() rather than strcspn(), and if you happen to
> know the length too, use memchr(). This also means you don't need to do the
> strlen() again to check the result.
Don't have the length, but getting it once and then using strchr/memchr,
should work. thanks.
> > + memset(derived_key, 0, sizeof derived_key);
> > + ret = get_derived_key(derived_key, AUTH_KEY, master_key, master_keylen)
>
> Is the memset() actually necessary?
not sure, will check.
> > + decrypted_datalen = (unsigned short)dlen;
>
> Unnecessary cast.
ok
> > + *(datablob + datalen) = 0;
> > + *(buf + datalen) = 0;
>
> Use [].
> > + if (index == strlen(new_master_desc)
> > + || (strncmp(new_master_desc, epayload->master_desc, index) != 0)) {
>
> Superfluous brackets.
>
> Mimi Zohar <zohar@xxxxxxxxxxxxxxxxxx> wrote:
>
> > + mkey = request_master_key(epayload, &master_key, &master_keylen);
> > + if (IS_ERR(mkey))
> > + return PTR_ERR(mkey);
> > +
> > + memset(derived_key, 0, sizeof derived_key);
> > + ret = get_derived_key(derived_key, ENC_KEY, master_key, master_keylen);
> > + if (ret < 0)
> > + goto out;
> > +
> > + ret = derived_key_encrypt(epayload, derived_key, sizeof derived_key);
> > + if (ret < 0)
> > + goto out;
> > +
> > + ret = datablob_hmac_append(epayload, master_key, master_keylen);
> > + if (ret < 0)
> > + goto out;
> > +
> > + ret = datablob_format(buffer, epayload, asciiblob_len);
> > + if (ret < 0)
> > + goto out;
> > +
> > + rcu_read_unlock();
>
> NAK! This is not safe. You may not sleep whilst you hold the RCU read lock
> on the master key. At the very least, datablob_format() may sleep as it
> writes to userspace.
datablob_format() could be split up into formatting the string returned
to userspace and copying it userspace, releasing the lock before copying
it, but that wouldn't resolve the other places it may sleep, like alloc.
> I think what you should do is ignore RCU entirely and read lock the master
> key's semaphore.
thanks, will do.
> > + ret = aes_get_sizes();
> > + return ret;
>
> Merge.
>
> David
ok
thanks,
Mimi
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
