From patchwork Fri Aug 11 16:50:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 712614 Delivered-To: patch@linaro.org Received: by 2002:adf:a390:0:b0:317:ecd7:513f with SMTP id l16csp1482483wrb; Fri, 11 Aug 2023 09:52:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUINf35zPBNgEGnu89my+afHhFpgq9fATV0Mq4F8j5pF9QrJ5dRdAtRs8OeEsYa0wJcGXW X-Received: by 2002:a0c:da8b:0:b0:63d:203:eb3b with SMTP id z11-20020a0cda8b000000b0063d0203eb3bmr2540201qvj.36.1691772777840; Fri, 11 Aug 2023 09:52:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691772777; cv=none; d=google.com; s=arc-20160816; b=W0VWJF6i1dvj4b+oSkymYvwKxj+ZSe40aX8Q0ZR+7qZA+JGKhN44y0ngEBkKqsMQFU ZQzc1Ro5ERYQhiJmmnlDH+njGaBdxbm9QQW+NByuaeEEFWaAEWcVq4xz9xtCxSwNs0Mv PPUW7geVcU5Gra65O7jKZE9ZRspi8OI/OYCgy41mbn6x2k/PtKhRp6+nwk8dmpRepVcO rdN8va2DBGqIjT3uFph1aBazNgjwmH50qne5pIQPtGJEIxrsf0iNLTgaLQIfb3ObzvTf sIlJVXsAOs75MAkW/A+7puZbKpdQgLNDRtsi1GbYSVKJ1L2/THuUyRAARwHcO/72c9Q/ hetA== 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=RtG96b3jmli1q7lVtewuvoGgDoJMS7AqHQZel0hsDHw=; fh=kNJidqFjxQIJ5KuZrzJozBZzMcjrUTD9AQ28ALCLCZM=; b=Et40wvGviNTDxoaLx+CWkqUsg0Tc3dGDIc7tR9PwE2dCeBOrSraaNtuVDmEIykmufZ nPG/hiieqMZk5P0CMtF6RbrZ/xmboiC/KGoG+0mhCtbCZW2XQaLSlzb24pQGM1dtVYI6 r521TJRPdpw21BpKn6iAX68uw6ZyExgErfM+rtCJpqJfiTBT339GqmIy15Mo9UijhK0c 8pI5aD39LTTyAwR96uJ4MZkkz49Gr8WqMgFmZ4SRYPHRe9thAsMmOSKddNuaG0ug/0lq jVdc6fv92vKNEwP2dBUvdiAyOe7ZGSabpJLnABGnaXoKb537T3iFk48m0Kd4zqVVbzmR M94A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UiXW5TU+; 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 g5-20020a0cdf05000000b00642b9b87526si714290qvl.558.2023.08.11.09.52.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Aug 2023 09:52:57 -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=UiXW5TU+; 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 1qUVLu-0005ll-PM; Fri, 11 Aug 2023 12:51:07 -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 1qUVLq-0005jd-9C for qemu-devel@nongnu.org; Fri, 11 Aug 2023 12:51:02 -0400 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUVLo-0001MM-Jp for qemu-devel@nongnu.org; Fri, 11 Aug 2023 12:51:02 -0400 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-563f8e8a53dso1423477a12.3 for ; Fri, 11 Aug 2023 09:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1691772659; x=1692377459; 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=RtG96b3jmli1q7lVtewuvoGgDoJMS7AqHQZel0hsDHw=; b=UiXW5TU+wILTYLNL38oY7ZT/faQ7p/gDcFPljcXnk6DSGenvZNoESlruX7ncDUIMce 8Iji+wBNTXPbiOoyBDIXHILZaML2e0D6FXq42ACW5bKdCt1vt9Sbb4CdEVjbNLkYgiWc Oe9gNO8gLRhV+Mtzw7HZiK2FsR++V2LHzCsq/XKL4Zw9kwsnTV6PlJLxQjBZibgCP8qw miT7dxQVtWNRcwJrD6QA5qqkxGgoJ4gmRdV1pQT09XzYVoyX4HowicRLnL4SZdUMczHu QqmEseRP5+P/85btDUAUpWWF3ATHeLecqm1oVnQznzldpS7NdVCqbVqTeM3OSZ3xreO5 zRsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691772659; x=1692377459; 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=RtG96b3jmli1q7lVtewuvoGgDoJMS7AqHQZel0hsDHw=; b=E4q48YgXaGVUtrrZFC9DoiEUOSjEaZ5t81YSCvUiGPLoztm//QmCUyQHQ2bt6JijL+ Z5Km7eyZ2U7dPbiTn+X8h6pq6ZHHnwDJTZaGBtebHq4j3m31U35pRT59jNA9LusRIZpc hsnG/qttUtM3iElhS+bEEipF+GvyMPhIHQCPyfFkOtByEGQAhKFUGJV9/2fTKpeX3D+y jriJiJJxBHpcr0RAeeWEpvFuAa1nciQjsCQmgmtOM9iQ6JKIeLyQ1jgjiKbxwnkl/JqF GXPAFdSrvYCeOwQY1RsmKyzJtKwZPmqxVoTvYrnh3t48/cnfGZhKKCbjCGMp6J4I9/1P d4mg== X-Gm-Message-State: AOJu0Yw6c8c/nD5TX2xfqAFZZUpTYKMekzY0GVts0mSxne0PHO0e3T2y Gl/rNXxlzQdMiXSsI/vJIX+j1VFTbAiRikWN60w= X-Received: by 2002:a17:90a:f3c7:b0:267:e011:3e9a with SMTP id ha7-20020a17090af3c700b00267e0113e9amr1597673pjb.3.1691772659260; Fri, 11 Aug 2023 09:50:59 -0700 (PDT) Received: from stoup.. ([2602:47:d483:7301:e773:351d:2db2:8a8a]) by smtp.gmail.com with ESMTPSA id 22-20020a17090a19d600b00263d3448141sm3803713pjj.8.2023.08.11.09.50.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 09:50:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, pbonzini@redhat.com, philmd@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 06/15] linux-user: Replace bprm->fd with bprm->src.fd Date: Fri, 11 Aug 2023 09:50:43 -0700 Message-Id: <20230811165052.161080-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230811165052.161080-1-richard.henderson@linaro.org> References: <20230811165052.161080-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.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 311d20f5d1..5b4cdddd50 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 8f5e9f489b..15e3ec5f6b 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);