Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp3088989ybk; Mon, 18 May 2020 17:40:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzvsjq62zVLZh93/6ow8/Hvq2cPfTxof4ZI1Tgqqxbo1kyiXhB/2aXVdKh4RanyWXMbTuTR X-Received: by 2002:a50:8d5e:: with SMTP id t30mr15714230edt.332.1589848839415; Mon, 18 May 2020 17:40:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589848839; cv=none; d=google.com; s=arc-20160816; b=tNl1CqaQZXnIlRdX9Ta+O/hulpck+7SK6HLP2dJq12b3/bq4jtcRbOaBTuJqK1bxwx rfN8welTcirS29m6cdFlzgpa7G8WaoTsi5CVOjsiAds2AwbpfnOtzG1/2PZVbE10Xnlo FZZAVso/itRkGMFpJTRiUUDrZktPSxsYnt3tcl4K/zJDj41VFOfoAsepZE1/0PNZGaXT 9NNMU3GwgheyHXYde6qoxtFjohTn8PFrzZh3rP0gyalTuB1u4zv0lvHcbtcmHO2jbMYy ufWEZKg2NJGpuuIJJsyPijJfGlww7xMMJNqjvrtutr1xJK3rSwEZ+cQjmWlHr234IB9z Wd4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:subject:mime-version:user-agent :message-id:in-reply-to:date:references:cc:to:from; bh=fMxp+XFbaQSoZDt2NLaMiJgsiyd2RuZZ2wy1AhHU+YA=; b=lKcJlMiaQ0w3TA0/SJrDbxq2pFPbUOfKRHKU9m3oOFvnGIQ8pQK7FYTbB7CPq0De9V jBNcIirwv4/x+2knYBQluOPsj7/hW2LarbyPSNaHjVvHNIiHq1teuDcDsj5p9ISF04w9 bCa/FVZ3otOxO3/BjCCVvFoxRvmI/dcTLiPh46Hq+H9LOYKNtBLqfA6JtOty+jxB1bkS pi03Emv8I68E09jFA85XpRxziP35DMx5cM4l2hQd4mZFMV93IxfIGVNeEOYVzDE83hzY QTm2K5aMR13OTQs3pzJWzKpnbcOoDhQKYrnxopng1gDsTOjKwSqCSf48k6ATREoyaHoj 6uuQ== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=xmission.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f19si6576662edx.127.2020.05.18.17.40.16; Mon, 18 May 2020 17:40:39 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=xmission.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728198AbgESAgA (ORCPT + 99 others); Mon, 18 May 2020 20:36:00 -0400 Received: from out02.mta.xmission.com ([166.70.13.232]:59490 "EHLO out02.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726957AbgESAgA (ORCPT ); Mon, 18 May 2020 20:36:00 -0400 Received: from in02.mta.xmission.com ([166.70.13.52]) by out02.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jaqEh-0002js-2Y; Mon, 18 May 2020 18:35:59 -0600 Received: from ip68-227-160-95.om.om.cox.net ([68.227.160.95] helo=x220.xmission.com) by in02.mta.xmission.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.87) (envelope-from ) id 1jaqEg-0004V7-2k; Mon, 18 May 2020 18:35:58 -0600 From: ebiederm@xmission.com (Eric W. Biederman) To: Cc: Linus Torvalds , Oleg Nesterov , Jann Horn , Kees Cook , Greg Ungerer , Rob Landley , Bernd Edlinger , , Al Viro , Alexey Dobriyan , Andrew Morton , Casey Schaufler , linux-security-module@vger.kernel.org, James Morris , "Serge E. Hallyn" , Andy Lutomirski References: <87h7wujhmz.fsf@x220.int.ebiederm.org> <87sgga6ze4.fsf@x220.int.ebiederm.org> <87v9l4zyla.fsf_-_@x220.int.ebiederm.org> <877dx822er.fsf_-_@x220.int.ebiederm.org> Date: Mon, 18 May 2020 19:32:18 -0500 In-Reply-To: <877dx822er.fsf_-_@x220.int.ebiederm.org> (Eric W. Biederman's message of "Mon, 18 May 2020 19:29:00 -0500") Message-ID: <87d070zrvx.fsf_-_@x220.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1jaqEg-0004V7-2k;;;mid=<87d070zrvx.fsf_-_@x220.int.ebiederm.org>;;;hst=in02.mta.xmission.com;;;ip=68.227.160.95;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX1/9roiBo9Zi8ekR3M2JucjX1nO39mpsBoU= X-SA-Exim-Connect-IP: 68.227.160.95 X-SA-Exim-Mail-From: ebiederm@xmission.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa08.xmission.com X-Spam-Level: X-Spam-Status: No, score=0.5 required=8.0 tests=ALL_TRUSTED,BAYES_50, DCC_CHECK_NEGATIVE,T_TooManySym_01,XMSubLong autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 0.8 BAYES_50 BODY: Bayes spam probability is 40 to 60% * [score: 0.5000] * 0.7 XMSubLong Long Subject * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa08 0; Body=1 Fuz1=1 Fuz2=1] * 0.0 T_TooManySym_01 4+ unique symbols in subject X-Spam-DCC: ; sa08 0; Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ; X-Spam-Relay-Country: X-Spam-Timing: total 417 ms - load_scoreonly_sql: 0.06 (0.0%), signal_user_changed: 16 (3.8%), b_tie_ro: 14 (3.3%), parse: 1.59 (0.4%), extract_message_metadata: 14 (3.3%), get_uri_detail_list: 2.4 (0.6%), tests_pri_-1000: 14 (3.4%), tests_pri_-950: 1.36 (0.3%), tests_pri_-900: 1.25 (0.3%), tests_pri_-90: 63 (15.1%), check_bayes: 61 (14.5%), b_tokenize: 10 (2.4%), b_tok_get_all: 10 (2.5%), b_comp_prob: 3.0 (0.7%), b_tok_touch_all: 33 (7.8%), b_finish: 1.35 (0.3%), tests_pri_0: 290 (69.6%), check_dkim_signature: 0.56 (0.1%), check_dkim_adsp: 3.0 (0.7%), poll_dns_idle: 1.22 (0.3%), tests_pri_10: 2.6 (0.6%), tests_pri_500: 9 (2.1%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH v2 5/8] exec: Move the call of prepare_binprm into search_binary_handler X-Spam-Flag: No X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The code in prepare_binary_handler needs to be run every time search_binary_handler is called so move the call into search_binary_handler itself to make the code simpler and easier to understand. Signed-off-by: "Eric W. Biederman" --- arch/alpha/kernel/binfmt_loader.c | 3 --- fs/binfmt_em86.c | 4 ---- fs/binfmt_misc.c | 4 ---- fs/binfmt_script.c | 3 --- fs/exec.c | 12 +++++------- include/linux/binfmts.h | 1 - 6 files changed, 5 insertions(+), 22 deletions(-) diff --git a/arch/alpha/kernel/binfmt_loader.c b/arch/alpha/kernel/binfmt_loader.c index a8d0d6e06526..d712ba51d15a 100644 --- a/arch/alpha/kernel/binfmt_loader.c +++ b/arch/alpha/kernel/binfmt_loader.c @@ -35,9 +35,6 @@ static int load_binary(struct linux_binprm *bprm) bprm->file = file; bprm->loader = loader; - retval = prepare_binprm(bprm); - if (retval < 0) - return retval; return search_binary_handler(bprm); } diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c index 466497860c62..cedde2341ade 100644 --- a/fs/binfmt_em86.c +++ b/fs/binfmt_em86.c @@ -91,10 +91,6 @@ static int load_em86(struct linux_binprm *bprm) bprm->file = file; - retval = prepare_binprm(bprm); - if (retval < 0) - return retval; - return search_binary_handler(bprm); } diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 264829745d6f..50a73afdf9b7 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -221,10 +221,6 @@ static int load_misc_binary(struct linux_binprm *bprm) if (fmt->flags & MISC_FMT_CREDENTIALS) bprm->preserve_creds = 1; - retval = prepare_binprm(bprm); - if (retval < 0) - goto error; - retval = search_binary_handler(bprm); if (retval < 0) goto error; diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c index e9e6a6f4a35f..8d718d8fd0fe 100644 --- a/fs/binfmt_script.c +++ b/fs/binfmt_script.c @@ -143,9 +143,6 @@ static int load_script(struct linux_binprm *bprm) return PTR_ERR(file); bprm->file = file; - retval = prepare_binprm(bprm); - if (retval < 0) - return retval; return search_binary_handler(bprm); } diff --git a/fs/exec.c b/fs/exec.c index 028e0e323af5..5fc458460e44 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1629,7 +1629,7 @@ static void bprm_fill_uid(struct linux_binprm *bprm) * * This may be called multiple times for binary chains (scripts for example). */ -int prepare_binprm(struct linux_binprm *bprm) +static int prepare_binprm(struct linux_binprm *bprm) { loff_t pos = 0; @@ -1650,8 +1650,6 @@ int prepare_binprm(struct linux_binprm *bprm) return kernel_read(bprm->file, bprm->buf, BINPRM_BUF_SIZE, &pos); } -EXPORT_SYMBOL(prepare_binprm); - /* * Arguments are '\0' separated strings found at the location bprm->p * points to; chop off the first by relocating brpm->p to right after @@ -1707,6 +1705,10 @@ int search_binary_handler(struct linux_binprm *bprm) if (bprm->recursion_depth > 5) return -ELOOP; + retval = prepare_binprm(bprm); + if (retval < 0) + return retval; + retval = security_bprm_check(bprm); if (retval) return retval; @@ -1864,10 +1866,6 @@ static int __do_execve_file(int fd, struct filename *filename, if (retval) goto out; - retval = prepare_binprm(bprm); - if (retval < 0) - goto out; - retval = copy_strings_kernel(1, &bprm->filename, bprm); if (retval < 0) goto out; diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index dbb5614d62a2..8c7779d6bf19 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -116,7 +116,6 @@ static inline void insert_binfmt(struct linux_binfmt *fmt) extern void unregister_binfmt(struct linux_binfmt *); -extern int prepare_binprm(struct linux_binprm *); extern int __must_check remove_arg_zero(struct linux_binprm *); extern int search_binary_handler(struct linux_binprm *); extern int begin_new_exec(struct linux_binprm * bprm); -- 2.25.0