From patchwork Wed Oct 19 07:43:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rolf Eike Beer X-Patchwork-Id: 4466 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp184170wrs; Wed, 19 Oct 2022 00:47:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Dt3ve6E4WUpCePjv7F6facZlPij97DlKud/ARMwTmxLgjF83BEPeQN97xwuI43CB7ZkDP X-Received: by 2002:a63:8:0:b0:460:e669:a0c4 with SMTP id 8-20020a630008000000b00460e669a0c4mr6159849pga.475.1666165638329; Wed, 19 Oct 2022 00:47:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666165638; cv=none; d=google.com; s=arc-20160816; b=mbjWW9L+pGKbTlcX8nQqBmorN4H27p5wyApvGVVuwyt4xB9pbAGB1pxffVcxBpXyO+ rEklOIAJ0Jzc0c8gzzT4WTlWyWFReg9vvsNhUtZ6O3g+y3MwH7IpCtLdnwjwQEOrjf1N twtlhH4bak1XtAHvpMQvC4kn7Sdme+mt9nddLi8Zf/+jYlVelk1EWyA708MTPfqG7EV+ kB/nfPwECxpeVoxJNNCgLGFseZUN0tWBLK4tN+fazkqNvuKzqKY1GZBf6eMJ5dw2o0Z4 yI4/sfKgasJ5FsfiiWiREuDwLt3Gj02bnA5unW2W5P2+sFTzwOJknZX9whcUJ9NcG4LK Vp+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=kN+kApq6cGOyxzYQI6W153CN3NrELHg/qok+YHrVfUQ=; b=yOm70j/SuJ2Cc+uP7Htt/rPRTQaQvEdnlgCiYd3rlQUDH0tn/ZjZHzpWyT0wU/Xzm1 xWHzV3ulyhOa4KoQOqKYQEjt1OlLRZg8dlgWZEFb5ivS2WKYtJtCzihL1wm2ga+5mjXx qrzwc3UOm1Dr73b+oG87KP9w7+PCKZjBXmSJRZFo8XAG5b+ceEcDPqC2ilWl1cLMcw2D h+54XJnE4rYxhZMThkKIIjxE3BvW2QpwWUyCe62nyd3kb45aJ48XDnq5xtFZzDTvc62C 0G8aLVjiLPHIepfZ28L9PNZ2TOdhjiA1UILxcAqC2hblwIU+uJe5QI7Juop5O+hpTOSd SIjw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s3-20020a170902ea0300b001853a1fddecsi19300343plg.403.2022.10.19.00.47.01; Wed, 19 Oct 2022 00:47:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230038AbiJSHnG convert rfc822-to-8bit (ORCPT + 99 others); Wed, 19 Oct 2022 03:43:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229498AbiJSHnE (ORCPT ); Wed, 19 Oct 2022 03:43:04 -0400 Received: from mx1.emlix.com (mx1.emlix.com [136.243.223.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D499C786DB; Wed, 19 Oct 2022 00:43:03 -0700 (PDT) Received: from mailer.emlix.com (p5098be52.dip0.t-ipconnect.de [80.152.190.82]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.emlix.com (Postfix) with ESMTPS id 69C9C5FB28; Wed, 19 Oct 2022 09:43:02 +0200 (CEST) From: Rolf Eike Beer To: Alexander Viro , Eric Biederman , Kees Cook Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] binfmt_elf: fix documented return value for load_elf_phdrs() Date: Wed, 19 Oct 2022 09:43:01 +0200 Message-ID: <2359389.EDbqzprbEW@mobilepool36.emlix.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747101300548052938?= X-GMAIL-MSGID: =?utf-8?q?1747101300548052938?= This function has never returned anything but a plain NULL. Fixes: 6a8d38945cf4 ("binfmt_elf: Hoist ELF program header loading to a function") Signed-off-by: Rolf Eike Beer --- fs/binfmt_elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 63c7ebb0da89..cfd5f7ad019d 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -456,7 +456,7 @@ static unsigned long maximum_alignment(struct elf_phdr *cmds, int nr) * * Loads ELF program headers from the binary file elf_file, which has the ELF * header pointed to by elf_ex, into a newly allocated array. The caller is - * responsible for freeing the allocated data. Returns an ERR_PTR upon failure. + * responsible for freeing the allocated data. Returns NULL upon failure. */ static struct elf_phdr *load_elf_phdrs(const struct elfhdr *elf_ex, struct file *elf_file)