From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751690AbbGMEJM (ORCPT ); Mon, 13 Jul 2015 00:09:12 -0400 Received: from helcar.hengli.com.au ([209.40.204.226]:56994 "EHLO helcar.hengli.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751596AbbGMEJH (ORCPT ); Mon, 13 Jul 2015 00:09:07 -0400 Date: Mon, 13 Jul 2015 12:08:58 +0800 From: Herbert Xu To: Linus Torvalds , "David S. Miller" , Linux Kernel Mailing List , Linux Crypto Mailing List Subject: Crypto Fixes for 4.2 Message-ID: <20150713040858.GA7160@gondor.apana.org.au> References: <20131107080131.GA32307@gondor.apana.org.au> <20140123115319.GA20602@gondor.apana.org.au> <20140401100001.GA12386@gondor.apana.org.au> <20140605062336.GA14440@gondor.apana.org.au> <20140804130339.GA1178@gondor.apana.org.au> <20141007131826.GA29688@gondor.apana.org.au> <20141211125119.GA12380@gondor.apana.org.au> <20150214094328.GA7457@gondor.apana.org.au> <20150626102234.GA19393@gondor.apana.org.au> <20150630135135.GA24621@gondor.apana.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150630135135.GA24621@gondor.apana.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus: This push fixes a duplicate dma_unmap_sg call in omap-des and reentrancy bugs in the powerpc nx driver which may cause bogus output or worse memory corruption. Please pull from git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git Herbert Xu (1): crypto: nx - Fix reentrancy bugs Vutla, Lokesh (1): crypto: omap-des - Fix unmapping of dma channels drivers/crypto/nx/nx-aes-ccm.c | 6 ++-- drivers/crypto/nx/nx-aes-ctr.c | 7 ++-- drivers/crypto/nx/nx-aes-gcm.c | 17 ++++++---- drivers/crypto/nx/nx-aes-xcbc.c | 70 ++++++++++++++++++++++++--------------- drivers/crypto/nx/nx-sha256.c | 43 +++++++++++++----------- drivers/crypto/nx/nx-sha512.c | 44 +++++++++++++----------- drivers/crypto/nx/nx.c | 3 ++ drivers/crypto/nx/nx.h | 14 ++++++-- drivers/crypto/omap-des.c | 3 -- 9 files changed, 125 insertions(+), 82 deletions(-) Thanks, -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt