From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758286AbcC2UWk (ORCPT ); Tue, 29 Mar 2016 16:22:40 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:45078 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757941AbcC2UEz (ORCPT ); Tue, 29 Mar 2016 16:04:55 -0400 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org Date: Tue, 29 Mar 2016 20:18:22 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.2 01/62] Revert "crypto: algif_skcipher - Do not dereference ctx without socket lock" In-Reply-To: X-SA-Exim-Connect-IP: 213.146.164.225 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.2.79-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Ben Hutchings This reverts commit c54ddfbb1b691d77c52b76ca6e13ca7082eb3b82, which was a poorly backported version of commit 6454c2b83f719057069777132b13949e4c6b6350 upstream. The small part I was able to backport makes no sense by itself. Signed-off-by: Ben Hutchings --- crypto/algif_skcipher.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -249,11 +249,8 @@ static int skcipher_sendmsg(struct kiocb { struct sock *sk = sock->sk; struct alg_sock *ask = alg_sk(sk); - struct sock *psk = ask->parent; - struct alg_sock *pask = alg_sk(psk); struct skcipher_ctx *ctx = ask->private; - struct ablkcipher_tfm *skc = pask->private; - struct crypto_ablkcipher *tfm = skc->base; + struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(&ctx->req); unsigned ivsize = crypto_ablkcipher_ivsize(tfm); struct skcipher_sg_list *sgl; struct af_alg_control con = {};