From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 337E646B5 for ; Mon, 16 Jan 2023 16:29:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6CBBC433D2; Mon, 16 Jan 2023 16:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673886594; bh=NXswxeOoOqrl7fJ+kl1oTll+1U75tTxuR8+wlOzjJcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AI+6ZRHi6ChxQRVdYry//Ap/mr4BLrELWX0tRvsb5eANxzEX+2kqrYnSj6NCg/sIh xlhIzf1ZZjdo5TBWeg/RbS0CRHtnGibsTT2ct6jCeZYImB8/RGjZrUoau9SlghTSRp IYvexTn2vYg94Q0pZhq40sPQ9BasDURq5Q6bcuxA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Wang Yufen , Kees Cook , Sasha Levin Subject: [PATCH 5.4 490/658] binfmt: Fix error return code in load_elf_fdpic_binary() Date: Mon, 16 Jan 2023 16:49:38 +0100 Message-Id: <20230116154931.944502415@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116154909.645460653@linuxfoundation.org> References: <20230116154909.645460653@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Wang Yufen [ Upstream commit e7f703ff2507f4e9f496da96cd4b78fd3026120c ] Fix to return a negative error code from create_elf_fdpic_tables() instead of 0. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Signed-off-by: Wang Yufen Signed-off-by: Kees Cook Link: https://lore.kernel.org/r/1669945261-30271-1-git-send-email-wangyufen@huawei.com Signed-off-by: Sasha Levin --- fs/binfmt_elf_fdpic.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 9f785627009c..39bcbfab386d 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -435,8 +435,9 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm) current->mm->start_stack = current->mm->start_brk + stack_size; #endif - if (create_elf_fdpic_tables(bprm, current->mm, - &exec_params, &interp_params) < 0) + retval = create_elf_fdpic_tables(bprm, current->mm, &exec_params, + &interp_params); + if (retval < 0) goto error; kdebug("- start_code %lx", current->mm->start_code); -- 2.35.1