X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=crypto%2Fcrypto_user.c;h=16f8693cc147ff9d8c864cc769b6632d8d105e45;hb=940b45ec18cf00046b8b28299d97066a2c43d559;hp=0605a2bbba75e17e67e59f602f1d12c453404031;hpb=9785dbdf265ddc47d5c88267d89a97648c0dc14b;p=~andy%2Flinux

diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index 0605a2bbba7..16f8693cc14 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -298,7 +298,7 @@ static int crypto_del_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
 	if (atomic_read(&alg->cra_refcnt) != 1)
 		return -EBUSY;
 
-	return crypto_unregister_alg(alg);
+	return crypto_unregister_instance(alg);
 }
 
 static int crypto_add_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
@@ -382,7 +382,7 @@ static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 	type -= CRYPTO_MSG_BASE;
 	link = &crypto_dispatch[type];
 
-	if (security_netlink_recv(skb, CAP_NET_ADMIN))
+	if (!capable(CAP_NET_ADMIN))
 		return -EPERM;
 
 	if ((type == (CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE) &&