diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-02 22:54:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-08 09:43:05 +0100 |
| commit | b3a65e4a6cedf0041165e76c708eacc77d8c3c5e (patch) | |
| tree | 8e046c42a161027e610e535045bc1dd2e41d615e | |
| parent | f7e5f460f5d4e8fa685c7c3bc180374d9cea6ea3 (diff) | |
Fix "crypto: algif_hash - Require setkey before accept(2)"
Fix up commit cec8983e6d2cf52e60cd59583ae30f81f923f563 which was commit
6de62f15b581f920ade22d758f4c338311c2f0d4 upstream.
The function prototypes were wrong. Someone was ignoring compiler
warnings :(
Cc: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | crypto/algif_hash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index 434af81b9e33..df99445a899a 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -283,8 +283,8 @@ unlock_child: return err; } -static int hash_sendmsg_nokey(struct socket *sock, struct msghdr *msg, - size_t size) +static int hash_sendmsg_nokey(struct kiocb *unused, struct socket *sock, + struct msghdr *msg, size_t size) { int err; @@ -307,8 +307,8 @@ static ssize_t hash_sendpage_nokey(struct socket *sock, struct page *page, return hash_sendpage(sock, page, offset, size, flags); } -static int hash_recvmsg_nokey(struct socket *sock, struct msghdr *msg, - size_t ignored, int flags) +static int hash_recvmsg_nokey(struct kiocb *unused, struct socket *sock, + struct msghdr *msg, size_t ignored, int flags) { int err; |