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

[linux-2.6-block.git] / crypto / af_alg.c

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index f41047ab60f551751e2328c7c40e49b9bfeb3a33..0f8d8d5523c317f954fd4de62299961fed4bb141 100644 (file)
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -150,7 +150,7 @@ EXPORT_SYMBOL_GPL(af_alg_release_parent);
 
 static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 {
-       const u32 forbidden = CRYPTO_ALG_INTERNAL;
+       const u32 allowed = CRYPTO_ALG_KERN_DRIVER_ONLY;
        struct sock *sk = sock->sk;
        struct alg_sock *ask = alg_sk(sk);
        struct sockaddr_alg *sa = (void *)uaddr;
@@ -158,6 +158,10 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
        void *private;
        int err;
 
+       /* If caller uses non-allowed flag, return error. */
+       if ((sa->salg_feat & ~allowed) || (sa->salg_mask & ~allowed))
+               return -EINVAL;
+
        if (sock->state == SS_CONNECTED)
                return -EINVAL;
 
@@ -176,9 +180,7 @@ static int alg_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
        if (IS_ERR(type))
                return PTR_ERR(type);
 
-       private = type->bind(sa->salg_name,
-                            sa->salg_feat & ~forbidden,
-                            sa->salg_mask & ~forbidden);
+       private = type->bind(sa->salg_name, sa->salg_feat, sa->salg_mask);
        if (IS_ERR(private)) {
                module_put(type->owner);
                return PTR_ERR(private);