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=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 DB4F1C52D39 for ; Thu, 27 Feb 2020 14:06:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B327424656 for ; Thu, 27 Feb 2020 14:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812367; bh=Nrda/e+TI3z53Jr29+WV9NkQUgv+EIWLfO9aFVyzn7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KKTLel6lseBVgsBKmWbPgRJ0prTq4Ovq06HP/amYbTm4dA3s6lLRlE5+qS39zZz2P aBwdkETJFdkKL7WYXLUgggtwJUKRlBFsCHbMrxrg0Grkq5ExSn41xfxkd5d0R3tkIf xhgitYNHEzMOW3bzzRnBXFkMlrlS5lHAyEICZOIk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387889AbgB0OGG (ORCPT ); Thu, 27 Feb 2020 09:06:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:43048 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387871AbgB0OGD (ORCPT ); Thu, 27 Feb 2020 09:06:03 -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 A0C4020578; Thu, 27 Feb 2020 14:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812363; bh=Nrda/e+TI3z53Jr29+WV9NkQUgv+EIWLfO9aFVyzn7s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/nyoc+Dl//6yYaKBalz0hBZUyTS1EjM0fd2YPteC0sRB5GICoOr+DA40GFWWPXRG RkyT2xq6ZYgMi2ZCo+kVHz9ZoE4NirLF4EBzMK+8epLOgBgZkDzwLErqjoKr1iXCOl s8I1bUZ6bRWnxxiEGjXXvhP/KRVeoYj5ikxPtjFM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aditya Pakki , Tyler Hicks Subject: [PATCH 4.19 86/97] ecryptfs: replace BUG_ON with error handling code Date: Thu, 27 Feb 2020 14:37:34 +0100 Message-Id: <20200227132228.648637738@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132214.553656188@linuxfoundation.org> References: <20200227132214.553656188@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aditya Pakki commit 2c2a7552dd6465e8fde6bc9cccf8d66ed1c1eb72 upstream. In crypt_scatterlist, if the crypt_stat argument is not set up correctly, the kernel crashes. Instead, by returning an error code upstream, the error is handled safely. The issue is detected via a static analysis tool written by us. Fixes: 237fead619984 (ecryptfs: fs/Makefile and fs/Kconfig) Signed-off-by: Aditya Pakki Signed-off-by: Tyler Hicks Signed-off-by: Greg Kroah-Hartman --- fs/ecryptfs/crypto.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/fs/ecryptfs/crypto.c +++ b/fs/ecryptfs/crypto.c @@ -325,8 +325,10 @@ static int crypt_scatterlist(struct ecry struct extent_crypt_result ecr; int rc = 0; - BUG_ON(!crypt_stat || !crypt_stat->tfm - || !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED)); + if (!crypt_stat || !crypt_stat->tfm + || !(crypt_stat->flags & ECRYPTFS_STRUCT_INITIALIZED)) + return -EINVAL; + if (unlikely(ecryptfs_verbosity > 0)) { ecryptfs_printk(KERN_DEBUG, "Key size [%zd]; key:\n", crypt_stat->key_size);