From patchwork Thu Feb 27 13:37:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230319 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 B22E3C3F372 for ; Thu, 27 Feb 2020 14:25:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 822DC24697 for ; Thu, 27 Feb 2020 14:25:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582813516; bh=sevjY8YSiEJ4WfRWOh772n1GYlFHoWmY89hx6uednB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ik1A+xgSU/nIZ9xH/6OaIKDm/CqwDn7Ou+tTP4ZEY0a2FhZGlnvvJjZN+QKN6hjJ4 pHVjYOgjYLhnSexWo0v5qlkn6TzPuakBStIbSN/wUd3OttD+dmMymeIhSF9o8O5pzV FFb/IzxbBWw9tXM7yJ6Fnr675/ZmtnnE251vCJQg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388709AbgB0OLg (ORCPT ); Thu, 27 Feb 2020 09:11:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:50000 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387598AbgB0OLb (ORCPT ); Thu, 27 Feb 2020 09:11:31 -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 ED63520578; Thu, 27 Feb 2020 14:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582812690; bh=sevjY8YSiEJ4WfRWOh772n1GYlFHoWmY89hx6uednB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WZ8AXBeR1MB8f9kDtg6OxlX1I+jniXLDbx39gOrW+5xlvt6FetEn1kxTcvmuCLFOF N4TG7JZetvOUZVxg3KPl+dUgvoiete5jWsnWFhCoVeEJW2rbi3ob/cnzQDpmxftr9f GpSnNSKcIqn9IhIEVSQViwcBKMQEVKfe8QvoWH1w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aditya Pakki , Tyler Hicks Subject: [PATCH 5.4 115/135] ecryptfs: replace BUG_ON with error handling code Date: Thu, 27 Feb 2020 14:37:35 +0100 Message-Id: <20200227132246.425973449@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200227132228.710492098@linuxfoundation.org> References: <20200227132228.710492098@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: 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 @@ -311,8 +311,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);