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.8 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,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 EF7F4C2D0DB for ; Thu, 30 Jan 2020 18:51:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C74A1205F4 for ; Thu, 30 Jan 2020 18:51:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580410267; bh=rTnGPWhJtUxx8YM07eUp4YSPeRUUXMPbXzznbDOrHcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lg7cnsIjgpLe2c8q21V0uSMN/jGm2aQSXsNvBIQkWSnwByku1t85Vu8oroPbbTgF4 fAMDo4LKhLXux2VUpums8TZO1shZ41bInht/4g833WUXo5oxjz3fXPr2OM+NK5os3P LroY8TuVJcNajl7h0VwnCd820c5TAPzw0v/WAipw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731135AbgA3SqG (ORCPT ); Thu, 30 Jan 2020 13:46:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:55984 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731129AbgA3SqG (ORCPT ); Thu, 30 Jan 2020 13:46:06 -0500 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 90E22214AF; Thu, 30 Jan 2020 18:46:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580409966; bh=rTnGPWhJtUxx8YM07eUp4YSPeRUUXMPbXzznbDOrHcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EidkPdsWIonXJHl28kinZRlUKuwKCT8h/nwoypKqDe2ZFAgmTK916UAEIIMvwhSFA KAmnyKFGjNLILmDggAEeP+LmVYJKdUs36mmc4frqpHns3Icj9y7gFddIVmtjRpes2C 2GNFjnizopPWi+nVehiwK9oF0ma9+UoVLZEpgb7E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+c2f1558d49e25cc36e5e@syzkaller.appspotmail.com, Eric Dumazet , Herbert Xu Subject: [PATCH 5.4 104/110] crypto: af_alg - Use bh_lock_sock in sk_destruct Date: Thu, 30 Jan 2020 19:39:20 +0100 Message-Id: <20200130183625.864185374@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200130183613.810054545@linuxfoundation.org> References: <20200130183613.810054545@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: Herbert Xu commit 37f96694cf73ba116993a9d2d99ad6a75fa7fdb0 upstream. As af_alg_release_parent may be called from BH context (most notably due to an async request that only completes after socket closure, or as reported here because of an RCU-delayed sk_destruct call), we must use bh_lock_sock instead of lock_sock. Reported-by: syzbot+c2f1558d49e25cc36e5e@syzkaller.appspotmail.com Reported-by: Eric Dumazet Fixes: c840ac6af3f8 ("crypto: af_alg - Disallow bind/setkey/...") Cc: Signed-off-by: Herbert Xu Signed-off-by: Greg Kroah-Hartman --- crypto/af_alg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/crypto/af_alg.c +++ b/crypto/af_alg.c @@ -134,11 +134,13 @@ void af_alg_release_parent(struct sock * sk = ask->parent; ask = alg_sk(sk); - lock_sock(sk); + local_bh_disable(); + bh_lock_sock(sk); ask->nokey_refcnt -= nokey; if (!last) last = !--ask->refcnt; - release_sock(sk); + bh_unlock_sock(sk); + local_bh_enable(); if (last) sock_put(sk);