From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53974 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755024AbdBGQSm (ORCPT ); Tue, 7 Feb 2017 11:18:42 -0500 Subject: Patch "Fix "crypto: algif_hash - Require setkey before accept(2)"" has been added to the 3.18-stable tree To: gregkh@linuxfoundation.org, alexander.levin@verizon.com Cc: , From: Date: Tue, 07 Feb 2017 17:18:41 +0100 Message-ID: <1486484321159116@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled Fix "crypto: algif_hash - Require setkey before accept(2)" to the 3.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: fix-crypto-algif_hash-require-setkey-before-accept-2.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From foo@baz Thu Feb 2 22:54:08 CET 2017 Date: Thu, 02 Feb 2017 22:54:08 +0100 To: Greg KH From: Greg Kroah-Hartman Subject: Fix "crypto: algif_hash - Require setkey before accept(2)" From: Greg Kroah-Hartman Fix up commit cec8983e6d2cf52e60cd59583ae30f81f923f563 which was commit 6de62f15b581f920ade22d758f4c338311c2f0d4 upstream. The function prototypes were wrong. Someone was ignoring compiler warnings :( Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- crypto/algif_hash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- 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(struc 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; Patches currently in stable-queue which might be from gregkh@linuxfoundation.org are queue-3.18/module_device_table-fix-some-callsites.patch queue-3.18/drm-i915-cleanup-some-indenting.patch queue-3.18/drivers-net-ethernet-dec-tulip-uli526x.c-fix-misleading-indentation-in-uli526x_timer.patch queue-3.18/iwlegacy-avoid-warning-about-missing-braces.patch queue-3.18/s3c-camif-fix-compiler-warnings.patch queue-3.18/fix-crypto-algif_hash-require-setkey-before-accept-2.patch queue-3.18/staging-iio-adc-fix-indent-on-break-statement.patch queue-3.18/bfa-fix-indentation.patch queue-3.18/x86-boot-add-config_paravirt_spinlocks-quirk-to-arch-x86-boot-compressed-misc.h.patch queue-3.18/xilinx-usb2-gadget-get-rid-of-incredibly-annoying-compile-warning.patch queue-3.18/hid-hid-input-add-parentheses-to-quell-gcc-warning.patch queue-3.18/net-caif-fix-misleading-indentation.patch queue-3.18/disable-frame-address-warning.patch queue-3.18/paride-fix-the-verbose-module-param.patch queue-3.18/be2iscsi-fix-bogus-warn_on-length-check.patch queue-3.18/i40e-reduce-stack-in-i40e_dbg_dump_desc.patch queue-3.18/netfilter-add-some-missing-default-cases-to-switch-statements-in-nft_reject.patch queue-3.18/spi-dw-mid-refactor-to-use-helpers.patch queue-3.18/x86-xen-fix-upper-bound-of-pmd-loop-in-xen_cleanhighmap.patch queue-3.18/ata-hpt366-fix-constant-cast-warning.patch queue-3.18/media-remove-unused-variable-that-causes-a-warning.patch queue-3.18/usb-renesas_usbhs-fix-build-warning-if-64-bit-architecture.patch queue-3.18/atm-iphase-fix-misleading-indention.patch queue-3.18/mtd-blkdevs-fix-switch-bool-compilation-warning.patch queue-3.18/net-add-sysctl_max_skb_frags.patch queue-3.18/netfilter-fix-switch-statement-warnings-with-recent-gcc.patch queue-3.18/alsa-oxygen-fix-logical-not-parentheses-warning.patch queue-3.18/blk-rq_data_dir-should-not-return-a-boolean.patch queue-3.18/bluetooth-make-hci_test_bit-s-addr-const.patch queue-3.18/staging-lustre-missing-curly-braces-in-ll_setattr_raw.patch queue-3.18/module-fix-types-of-device-tables-aliases.patch queue-3.18/staging-rtl8723au-core-rtw_wlan_util-fix-misleading-indentation.patch