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

torvalds · torvalds · commit 864f83a1f65b · 2015-11-17T09:40:05.000-08:00
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
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ static int adf_copy_key_value_data(struct adf_accel_dev *accel_dev,`
`198`	`198`	`goto out_err;`
`199`	`199`	`}`
`200`	`200`
`201`		`- params_head = section_head->params;`
	`201`	`+ params_head = section.params;`
`202`	`202`
`203`	`203`	`while (params_head) {`
`204`	`204`	`if (copy_from_user(&key_val, (void __user *)params_head,`