From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 01:53:21 +0000 (+1000)
Subject: Merge remote-tracking branch 'crypto/master'
X-Git-Tag: next-20140530~69
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=419a9111c11b1dc780b837ba9aecaa28b1829fa8;p=karo-tx-linux.git

Merge remote-tracking branch 'crypto/master'

Conflicts:
	crypto/crypto_user.c
	drivers/char/hw_random/Kconfig
	drivers/crypto/bfin_crc.h
	drivers/crypto/caam/error.c
---

419a9111c11b1dc780b837ba9aecaa28b1829fa8
diff --cc crypto/crypto_user.c
index 43665d0d0905,aa906b8fdd17..e2a34feec7a4
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@@ -265,6 -265,9 +265,9 @@@ static int crypto_update_alg(struct sk_
  	struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
  	LIST_HEAD(list);
  
 -	if (!capable(CAP_NET_ADMIN))
++	if (!netlink_capable(skb, CAP_NET_ADMIN))
+ 		return -EPERM;
+ 
  	if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
  		return -EINVAL;
  
@@@ -295,6 -298,9 +298,9 @@@ static int crypto_del_alg(struct sk_buf
  	struct crypto_alg *alg;
  	struct crypto_user_alg *p = nlmsg_data(nlh);
  
 -	if (!capable(CAP_NET_ADMIN))
++	if (!netlink_capable(skb, CAP_NET_ADMIN))
+ 		return -EPERM;
+ 
  	if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
  		return -EINVAL;
  
@@@ -379,6 -385,9 +385,9 @@@ static int crypto_add_alg(struct sk_buf
  	struct crypto_user_alg *p = nlmsg_data(nlh);
  	struct nlattr *priority = attrs[CRYPTOCFGA_PRIORITY_VAL];
  
 -	if (!capable(CAP_NET_ADMIN))
++	if (!netlink_capable(skb, CAP_NET_ADMIN))
+ 		return -EPERM;
+ 
  	if (!null_terminated(p->cru_name) || !null_terminated(p->cru_driver_name))
  		return -EINVAL;
  
diff --cc drivers/char/hw_random/Kconfig
index 244759bbd7b7,38cfae686cc4..ac6c0f3e2eb2
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@@ -342,11 -321,12 +321,12 @@@ config HW_RANDOM_TP
  	  If unsure, say Y.
  
  config HW_RANDOM_MSM
 -	tristate "Qualcomm MSM Random Number Generator support"
 -	depends on ARCH_MSM
 +	tristate "Qualcomm SoCs Random Number Generator support"
- 	depends on HW_RANDOM && ARCH_QCOM
++	depends on ARCH_QCOM
+ 	default HW_RANDOM
  	---help---
  	  This driver provides kernel-side support for the Random Number
 -	  Generator hardware found on Qualcomm MSM SoCs.
 +	  Generator hardware found on Qualcomm SoCs.
  
  	  To compile this driver as a module, choose M here. the
  	  module will be called msm-rng.