From patchwork Thu Jan 30 18:39:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 232353 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 585C6C33CB3 for ; Thu, 30 Jan 2020 18:49:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FD1220CC7 for ; Thu, 30 Jan 2020 18:49:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580410150; bh=LPXC/bbMwboiC8gkHl4hEag4UPlGj4kkNkiySF5hbBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PzY56INM5UCKKC09NuJtpr+3cQyC3X1yaP7ig54W9+w9M0q1ytxGZYntb1jt1Y7D2 4+xd72gO71SFD5oFQI+vU3WmS16fZ00qQQSJxmjMiUvt/uDQRAVa6QyL7bQHI7LphJ nCdkV+qUNH4GglaoRfjtt3gW2QVOIphnHpMB3DLc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731657AbgA3StF (ORCPT ); Thu, 30 Jan 2020 13:49:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:60322 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731643AbgA3StC (ORCPT ); Thu, 30 Jan 2020 13:49:02 -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 210FF214DB; Thu, 30 Jan 2020 18:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580410141; bh=LPXC/bbMwboiC8gkHl4hEag4UPlGj4kkNkiySF5hbBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fmuoFto5hywJTZBNpMcg8vR8BpSovB8pcPSXpUH3ckirnWiz13XL1MikDFSTsOCPn hg5hNq0QGCGn9IShfs7TBUeiHrubAxHzGPtI1SDJKhFOi/Bddv2KPRaPDttZwDx9DB YH+Qw0AcjubHj9bhvIfwkpZR7MKyVEMbXJrIw/oE= 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 4.19 51/55] crypto: af_alg - Use bh_lock_sock in sk_destruct Date: Thu, 30 Jan 2020 19:39:32 +0100 Message-Id: <20200130183617.714326366@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200130183608.563083888@linuxfoundation.org> References: <20200130183608.563083888@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 @@ -139,11 +139,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);