Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a bug in the qat driver where a user-space pointer is
  dereferenced"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: qat - don't use userspace pointer
This commit is contained in:
Linus Torvalds 2015-11-17 09:40:05 -08:00
commit 864f83a1f6

View file

@ -198,7 +198,7 @@ static int adf_copy_key_value_data(struct adf_accel_dev *accel_dev,
goto out_err;
}
params_head = section_head->params;
params_head = section.params;
while (params_head) {
if (copy_from_user(&key_val, (void __user *)params_head,