Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1430945pxf; Fri, 26 Mar 2021 07:43:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKwGAOrZ4D4iOjy/EGalzc9UEAb2yaEQ3etHa70KKSQi1SDw+pJrbieOq9n4RIsw7gyi5I X-Received: by 2002:a1c:9d0e:: with SMTP id g14mr13527776wme.30.1616769785229; Fri, 26 Mar 2021 07:43:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616769785; cv=none; d=google.com; s=arc-20160816; b=GS+CIynaSeX9CdUWdZ8QhAr/rsVtLWe9iT1DEuC+IJ+9kX1QOZiZRKwpiYmyonFoEn kNzX5GWCxB9LnoCljn1KNc/Xelu1OU0miCVWyai0w4UMPN7RRq3FGiO0AgLDMPTmvypS zg5KZ3ZHvrJil+ZRtScN+Ti3AG/Xb8158l1S0ZeuL7bBj7/dQJx7rsK9c34lSeEh7dc6 p+AZEQH8Q1ojk8/6J5RbwZckpslRDdWIboupV3GUnEaRcOLI/i+Xg6TmAlsox1O1S6Ya QWdT0XGjTjVi29ZHm16lFcvG5/k0OTIotzjUkAD/JWziLosWU1cjTJ9BkeI78vUSMjuG r5gg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ik1ZxFDTbN543xAdjkIaY+LrhRyZTgPPWblbYOdt+Ho=; b=RZ6ZX+p5tKQOZZ/2pnBSj1pylLYHvIaqghLnJXws3CkjGn2mAa92hSQ8aS18J3qvcb pPedWDHiNTovswgWj6JRXs88PnCOrsqs/bOxHZQYCEp5LGoJ8eufJnEiqWIybYJPX+L7 9zkP5w5CckhI8se0k6L1q1NoCOJXcL48ZeAgk/IJ2tzleyrXV20jptKDZTMpqWxDYE4v 16jr0tjBDJisaZ1KOIKKFRC4fCKpEbLqnJG6sfVFfv2lfDzEQdMKrz7SWgYuMC7GEEHa SqLCo870ERgnQ3DxOm0ejExVz8HzbCP1NLYnfVQL0eBbsYuHb8kfCodrounb5aSLZVXO uXFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=nG0Tk1zj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i13si6663928edq.522.2021.03.26.07.42.42; Fri, 26 Mar 2021 07:43:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=nG0Tk1zj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230476AbhCZOjj (ORCPT + 99 others); Fri, 26 Mar 2021 10:39:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53608 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbhCZOjS (ORCPT ); Fri, 26 Mar 2021 10:39:18 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A95AC0613AA; Fri, 26 Mar 2021 07:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=ik1ZxFDTbN543xAdjkIaY+LrhRyZTgPPWblbYOdt+Ho=; b=nG0Tk1zj75N7RMl5ukKyw29ZN3 b+NOjFYQo+wu7oBBfqqtji5laQisXQUxuPMbt4PIZGaF5UD040L3w0xZQgANcLCj4xlzSLv5c2bi0 lg9LbshcQpAREZtrDf18Q/SG8yTj+moIlWxcm5A0jZuwX9nyD35AhobYsHKdA5fX54UC0vHu8806g gsQQ4ddMqtHcBjByEmM6PFfM8jGudMsMvUmqfrPkPqsQZUPyECPVNPi/pHwO/6wQl9g9tp+eSJhLo ky70B67w9ulsBx+95/RE/FpcWOmqKKR/GxCJeqMv1ybsBv6RXTwNNLaTgHmzPqWkAYUa8nGsQP8tS c4NX3KcA==; Received: from [213.208.157.35] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1lPnbr-005U6S-Bx; Fri, 26 Mar 2021 14:38:47 +0000 From: Christoph Hellwig To: "Eric W. Biederman" , Al Viro Cc: Arnd Bergmann , Brian Gerst , Luis Chamberlain , linux-arm-kernel@lists.infradead.org, x86@kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] exec: remove do_execve Date: Fri, 26 Mar 2021 15:38:28 +0100 Message-Id: <20210326143831.1550030-2-hch@lst.de> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210326143831.1550030-1-hch@lst.de> References: <20210326143831.1550030-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Just call do_execveat instead. Signed-off-by: Christoph Hellwig --- fs/exec.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index 18594f11c31fe1..b63fb020909075 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1978,15 +1978,6 @@ int kernel_execve(const char *kernel_filename, return retval; } -static int do_execve(struct filename *filename, - const char __user *const __user *__argv, - const char __user *const __user *__envp) -{ - struct user_arg_ptr argv = { .ptr.native = __argv }; - struct user_arg_ptr envp = { .ptr.native = __envp }; - return do_execveat_common(AT_FDCWD, filename, argv, envp, 0); -} - static int do_execveat(int fd, struct filename *filename, const char __user *const __user *__argv, const char __user *const __user *__envp, @@ -2060,7 +2051,7 @@ SYSCALL_DEFINE3(execve, const char __user *const __user *, argv, const char __user *const __user *, envp) { - return do_execve(getname(filename), argv, envp); + return do_execveat(AT_FDCWD, getname(filename), argv, envp, 0); } SYSCALL_DEFINE5(execveat, -- 2.30.1