From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4928EC04AAC for ; Mon, 20 May 2019 12:41:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 150A621479 for ; Mon, 20 May 2019 12:41:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558356062; bh=8wo6OfwoxBhKFRN2XsFLYEb1OgS1BAfDkVDQKopJ80A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=X89AArL2T2b+OJq1jHLPdqgy0ngFw2Rm2Xm2F8mZtt9bstvpfmiPUK3mAU2oPwBBg hgrWyzSZuayHP/3kQbJ+EK3IoZSp6wfW2DFPJZ0ZnJ+lvBIQWVvSDqX+zyCwWSHqFI RM+1XaDMAvnkU8eNh9dIFOP+nUMZLl+KKPTQHP+M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390436AbfETMcI (ORCPT ); Mon, 20 May 2019 08:32:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:48876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732867AbfETMcH (ORCPT ); Mon, 20 May 2019 08:32:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 55B0921721; Mon, 20 May 2019 12:32:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355526; bh=8wo6OfwoxBhKFRN2XsFLYEb1OgS1BAfDkVDQKopJ80A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y/kCxP0xHYg8bSJfLCxvnkuc/VBphki7TA+h0wWE0tPAxsnaFMXfIHnLPs7onG1/R oUKiGUlJrc8l3ndbR1L0/lFUXdjvyo1WbOkvHaZmJKCjgjoJLr4hGnUe+uTWLqWDMh wnX9hpjLFchRgFm8IRbSgvblDWGVB93hMAgvkhJ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ondrej Mosnacek , Eric Biggers , Herbert Xu Subject: [PATCH 5.1 026/128] crypto: lrw - dont access already-freed walk.iv Date: Mon, 20 May 2019 14:13:33 +0200 Message-Id: <20190520115251.364236232@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115249.449077487@linuxfoundation.org> References: <20190520115249.449077487@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Eric Biggers commit aec286cd36eacfd797e3d5dab8d5d23c15d1bb5e upstream. If the user-provided IV needs to be aligned to the algorithm's alignmask, then skcipher_walk_virt() copies the IV into a new aligned buffer walk.iv. But skcipher_walk_virt() can fail afterwards, and then if the caller unconditionally accesses walk.iv, it's a use-after-free. Fix this in the LRW template by checking the return value of skcipher_walk_virt(). This bug was detected by my patches that improve testmgr to fuzz algorithms against their generic implementation. When the extra self-tests were run on a KASAN-enabled kernel, a KASAN use-after-free splat occured during lrw(aes) testing. Fixes: c778f96bf347 ("crypto: lrw - Optimize tweak computation") Cc: # v4.20+ Cc: Ondrej Mosnacek Signed-off-by: Eric Biggers Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- crypto/lrw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/crypto/lrw.c +++ b/crypto/lrw.c @@ -162,8 +162,10 @@ static int xor_tweak(struct skcipher_req } err = skcipher_walk_virt(&w, req, false); - iv = (__be32 *)w.iv; + if (err) + return err; + iv = (__be32 *)w.iv; counter[0] = be32_to_cpu(iv[3]); counter[1] = be32_to_cpu(iv[2]); counter[2] = be32_to_cpu(iv[1]);