Skip to content

Commit

Permalink
Fix "crypto: algif_hash - Require setkey before accept(2)"
Browse files Browse the repository at this point in the history
Fix up commit cec8983 which was commit
6de62f1 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>
  • Loading branch information
Greg Kroah-Hartman committed Feb 8, 2017
1 parent f7e5f46 commit b3a65e4
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions crypto/algif_hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ static int hash_check_key(struct socket *sock)
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;

Expand All @@ -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;

Expand Down

0 comments on commit b3a65e4

Please sign in to comment.