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 325D1C10F14 for ; Thu, 3 Oct 2019 16:53:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 07DF220862 for ; Thu, 3 Oct 2019 16:53:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121621; bh=1/khuy4O3zZHpw9LAei40BNaPZ3LL9+GHfckPbkNiRo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RDGtG0pUnv3m2uOD8wceS3AK7XOwFYOJvHDJy1ErCSIxAdG4dLTvKNG8OLsDeuLQ/ mmcFBg87yhZqzak2psEDqlKMMlfCsnf4Osstgpym9IHjqapL7JAtFref/kmvCZCLFR rGSqlAM2KP/wTniQvmyYUxJnE6NRRjbtHWc5mVN4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393202AbfJCQxj (ORCPT ); Thu, 3 Oct 2019 12:53:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:41670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392392AbfJCQxf (ORCPT ); Thu, 3 Oct 2019 12:53:35 -0400 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 580FE2070B; Thu, 3 Oct 2019 16:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570121614; bh=1/khuy4O3zZHpw9LAei40BNaPZ3LL9+GHfckPbkNiRo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rPFQag060fy0KhHewUhRlwpo+N6KwiPUZHW6OqUxdWdjDECbLVJy5pm829KLzcB2j 7ge3pFcIC2YlzgLejUg8zMM2Z2kyqWZ+TrJiOKlDOk/EpG5wnxlOe7Nb4HhS7H4eae c25qTen6CnKazpwOX+tZsbmaxtrEDH+4ZgmZmPwA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ding Xiang , Miklos Szeredi Subject: [PATCH 5.3 307/344] ovl: Fix dereferencing possible ERR_PTR() Date: Thu, 3 Oct 2019 17:54:32 +0200 Message-Id: <20191003154609.569642324@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154540.062170222@linuxfoundation.org> References: <20191003154540.062170222@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: Ding Xiang commit 97f024b9171e74c4443bbe8a8dce31b917f97ac5 upstream. if ovl_encode_real_fh() fails, no memory was allocated and the error in the error-valued pointer should be returned. Fixes: 9b6faee07470 ("ovl: check ERR_PTR() return value from ovl_encode_fh()") Signed-off-by: Ding Xiang Cc: # v4.16+ Signed-off-by: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman --- fs/overlayfs/export.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/fs/overlayfs/export.c +++ b/fs/overlayfs/export.c @@ -227,9 +227,8 @@ static int ovl_d_to_fh(struct dentry *de /* Encode an upper or lower file handle */ fh = ovl_encode_real_fh(enc_lower ? ovl_dentry_lower(dentry) : ovl_dentry_upper(dentry), !enc_lower); - err = PTR_ERR(fh); if (IS_ERR(fh)) - goto fail; + return PTR_ERR(fh); err = -EOVERFLOW; if (fh->len > buflen)