From patchwork Mon Oct 30 21:17:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 739287 Delivered-To: patch@linaro.org Received: by 2002:a5d:4c47:0:b0:32d:baff:b0ca with SMTP id n7csp1337536wrt; Mon, 30 Oct 2023 14:21:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGpQRlWRrkv85aGb0mfN61XcIyncRpksvHmhXuXz5b8ERKMjyOShOLj0Uw52b5Ip6xW+/0a X-Received: by 2002:a05:622a:208:b0:417:d600:115d with SMTP id b8-20020a05622a020800b00417d600115dmr12584308qtx.66.1698700900859; Mon, 30 Oct 2023 14:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698700900; cv=none; d=google.com; s=arc-20160816; b=UOogBryOE8Bir0SAYd65LWVJklmdvGd6J0Gbi3x4wmxJrq8fbTU7aTfK0xaUGpgDkY TE0rauT00XPgDYGRUYkpj1TDUwfXvNS1wUu9sVG1Lp8a4nI4q+RzAQYR1tE1R6XSHH4f DFP+cfjcCK460i44icVxCHed3cbJvGEV5CMsYAztdSOZjrn5XmaK4rqCSzSqMdWR4KlI gackskijTns2EC4oEXjqfwPuAeUGPq1fSUaxzHdtmRfzsxY49oH5wljMRj7vP5jOboT0 IFb4c3p+wknKosciHPjSp4bFcroaEpBWKvQi5YSsOWjG15IxV4KcJzERDRH3rTylP01E wVAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=srg8id7JB5fyMoPg/HaJjfZgMuzaSTlQ1OJOVHenLyc=; fh=7Rmoz3vyDpcEhnJW+jMvKhvM9P5kAiKNo2WiNXDg220=; b=F7iUrtyze1jmkQ0cS/X5IMuBFCmIr1XhOZe0Pdgj54SgG3K5UhHC0zn8w067fMnqjc 9RHIBvsuCQ6VNFUyoDuo698SuFZUOLZNceq7hBnSgrDKko1uW8UWbA6IWXg+WQXgs3Yo fvMANOZodZkhZ9I4FfOFavsg03WkflWNJHQX+Hd5Syc/kQegwixkmrcWGdpSEBPcT7v+ AXdvsHIvzeNSKTfgfzDwhFqYfRI0BxJbWC5UG4CkG7N1On3+TFA6czf6IRDQFBDRd3AS oGyxNN6SLnPAnT/P0UWZjxtEoIqvGuuohTqfz3ereuLEYt1ONlgbmShaYgL/0NSUqLJn QIyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pStFU0Kv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c22-20020a05622a025600b00412083895d8si6248989qtx.461.2023.10.30.14.21.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2023 14:21:40 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pStFU0Kv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxZe3-00014G-06; Mon, 30 Oct 2023 17:17:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxZdp-000101-Od for qemu-devel@nongnu.org; Mon, 30 Oct 2023 17:17:51 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxZdh-0006UM-T3 for qemu-devel@nongnu.org; Mon, 30 Oct 2023 17:17:40 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1c9b95943beso44873145ad.1 for ; Mon, 30 Oct 2023 14:17:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698700655; x=1699305455; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=srg8id7JB5fyMoPg/HaJjfZgMuzaSTlQ1OJOVHenLyc=; b=pStFU0Kv9HPPt97XOGB43gLyVjlEuT7fxIb6g3eOwM11EQQsbBOL0SBLtwoom3oxtu 4s3fAEKQJb+RBKNWknzJJJBK661nkCrcFYVOMxUnCf+4pggXJqEV1oqdJCeNepKDpR4R AyJDiswnG83KVSqvgecUm52mQTTSeGZ8Re4UC2ImewXGIWMzIvudoAItsqItblVKsXnr Pl8y0SbZseSJ/Xg2d5Rt0qd6h/u+aKxI9/FAsLHMs6jdieZ5cyTsIlTE3EiQU++0xTd6 iiA7z9t78QEMFagDGwlVbKz0qTLe+1jJTbIUcaVs4KyWc8tDSUg21Vk3Vct39Je5Hfr3 lszg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698700655; x=1699305455; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=srg8id7JB5fyMoPg/HaJjfZgMuzaSTlQ1OJOVHenLyc=; b=PGxVIg/iOMfS812iWTrt0rxxpKbXSqk2optgeYtORL4gJPpFfEGboyQlFXfCb2ZgCz lLMQGSa6OpOTuEvK85hFH/JVpqZYQ4+jXNAqCpF0PBXDdV5J+ZgMOuJCf5HtKtT/tJ4e Sigts9Jtm7cITLW44KESPDlQNhAMJ7U8/+cdX4htkRGJt/Wt+87qA5l6O/rpSDMWJoiZ cExL6BuTI6sYD2byj/BrV39mu/8yDAy6jTxVYWP80NI+TJwv98+mEnKLLyayAZd2lcB1 xzvd+6mTiKwm6RAqdVFRJArZqrrdxX8lizoE/LfvtgtluJBfdwMPKVn7vVB875U85jqL n93w== X-Gm-Message-State: AOJu0YysKfITHvn3HoBf5RM7/CdfxwzCFCVAZQ3k5cKLkC2lUbSYIOon ov+IiI0EO8QSujZb6yuExvpziIFzjw/16NQ7vU4= X-Received: by 2002:a17:903:41cd:b0:1cc:4e81:36a4 with SMTP id u13-20020a17090341cd00b001cc4e8136a4mr4348851ple.5.1698700655196; Mon, 30 Oct 2023 14:17:35 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id jf2-20020a170903268200b001cc32261bdfsm4670350plb.38.2023.10.30.14.17.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 14:17:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 07/21] linux-user: Replace bprm->fd with bprm->src.fd Date: Mon, 30 Oct 2023 14:17:13 -0700 Message-Id: <20231030211727.165090-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231030211727.165090-1-richard.henderson@linaro.org> References: <20231030211727.165090-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x634.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org There are only a couple of uses of bprm->fd remaining. Migrate to the other field. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- linux-user/loader.h | 1 - linux-user/flatload.c | 8 ++++---- linux-user/linuxload.c | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/linux-user/loader.h b/linux-user/loader.h index da6591fff0..a0834290e7 100644 --- a/linux-user/loader.h +++ b/linux-user/loader.h @@ -74,7 +74,6 @@ struct linux_binprm { char buf[BPRM_BUF_SIZE] __attribute__((aligned)); ImageSource src; abi_ulong p; - int fd; int e_uid, e_gid; int argc, envc; char **argv; diff --git a/linux-user/flatload.c b/linux-user/flatload.c index fdcc4610fa..5b62aa0a2b 100644 --- a/linux-user/flatload.c +++ b/linux-user/flatload.c @@ -463,7 +463,7 @@ static int load_flat_file(struct linux_binprm * bprm, DBG_FLT("BINFMT_FLAT: ROM mapping of file (we hope)\n"); textpos = target_mmap(0, text_len, PROT_READ|PROT_EXEC, - MAP_PRIVATE, bprm->fd, 0); + MAP_PRIVATE, bprm->src.fd, 0); if (textpos == -1) { fprintf(stderr, "Unable to mmap process text\n"); return -1; @@ -490,7 +490,7 @@ static int load_flat_file(struct linux_binprm * bprm, } else #endif { - result = target_pread(bprm->fd, datapos, + result = target_pread(bprm->src.fd, datapos, data_len + (relocs * sizeof(abi_ulong)), fpos); } @@ -540,10 +540,10 @@ static int load_flat_file(struct linux_binprm * bprm, else #endif { - result = target_pread(bprm->fd, textpos, + result = target_pread(bprm->src.fd, textpos, text_len, 0); if (result >= 0) { - result = target_pread(bprm->fd, datapos, + result = target_pread(bprm->src.fd, datapos, data_len + (relocs * sizeof(abi_ulong)), ntohl(hdr->data_start)); } diff --git a/linux-user/linuxload.c b/linux-user/linuxload.c index 5b7e9ab983..4a794f8cea 100644 --- a/linux-user/linuxload.c +++ b/linux-user/linuxload.c @@ -39,7 +39,7 @@ static int prepare_binprm(struct linux_binprm *bprm) int mode; int retval; - if (fstat(bprm->fd, &st) < 0) { + if (fstat(bprm->src.fd, &st) < 0) { return -errno; } @@ -69,7 +69,7 @@ static int prepare_binprm(struct linux_binprm *bprm) bprm->e_gid = st.st_gid; } - retval = read(bprm->fd, bprm->buf, BPRM_BUF_SIZE); + retval = read(bprm->src.fd, bprm->buf, BPRM_BUF_SIZE); if (retval < 0) { perror("prepare_binprm"); exit(-1); @@ -144,7 +144,6 @@ int loader_exec(int fdexec, const char *filename, char **argv, char **envp, { int retval; - bprm->fd = fdexec; bprm->src.fd = fdexec; bprm->filename = (char *)filename; bprm->argc = count(argv);