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=-5.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_NEOMUTT autolearn=ham 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 0228BC43387 for ; Sun, 23 Dec 2018 04:03:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3ADD218E0 for ; Sun, 23 Dec 2018 04:03:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405142AbeLWEDV (ORCPT ); Sat, 22 Dec 2018 23:03:21 -0500 Received: from orcrist.hmeau.com ([104.223.48.154]:38996 "EHLO deadmen.hmeau.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729640AbeLWEDV (ORCPT ); Sat, 22 Dec 2018 23:03:21 -0500 Received: from gondobar.mordor.me.apana.org.au ([192.168.128.4] helo=gondobar) by deadmen.hmeau.com with esmtps (Exim 4.89 #2 (Debian)) id 1gauyx-0008NS-Ny; Sun, 23 Dec 2018 12:03:15 +0800 Received: from herbert by gondobar with local (Exim 4.89) (envelope-from ) id 1gauyv-0004qR-10; Sun, 23 Dec 2018 12:03:13 +0800 Date: Sun, 23 Dec 2018 12:03:13 +0800 From: Herbert Xu To: Eric Biggers Cc: linux-crypto@vger.kernel.org, syzkaller-bugs@googlegroups.com, davem@davemloft.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH] crypto: x86/chacha - avoid sleeping under kernel_fpu_begin() Message-ID: <20181223040312.twgpjgmfs3wybnmb@gondor.apana.org.au> References: <000000000000fb268d057d13ea55@google.com> <20181215204017.7880-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181215204017.7880-1-ebiggers@kernel.org> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Dec 15, 2018 at 12:40:17PM -0800, Eric Biggers wrote: > From: Eric Biggers > > Passing atomic=true to skcipher_walk_virt() only makes the later > skcipher_walk_done() calls use atomic memory allocations, not > skcipher_walk_virt() itself. Thus, we have to move it outside of the > preemption-disabled region (kernel_fpu_begin()/kernel_fpu_end()). > > (skcipher_walk_virt() only allocates memory for certain layouts of the > input scatterlist, hence why I didn't notice this earlier...) > > Reported-by: syzbot+9bf843c33f782d73ae7d@syzkaller.appspotmail.com > Fixes: 4af78261870a ("crypto: x86/chacha20 - add XChaCha20 support") > Signed-off-by: Eric Biggers > --- > arch/x86/crypto/chacha_glue.c | 33 ++++++++++++++++++++------------- > 1 file changed, 20 insertions(+), 13 deletions(-) Patch applied. Thanks. -- Email: Herbert Xu Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt