qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Frajo <franz.haider@jolla.com>, Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 2/8] linux-user: Support f_flags in statfs64 when available.
Date: Mon, 26 Oct 2020 23:03:33 +0100	[thread overview]
Message-ID: <20201026220339.195790-3-laurent@vivier.eu> (raw)
In-Reply-To: <20201026220339.195790-1-laurent@vivier.eu>

From: Frajo <franz.haider@jolla.com>

Same as d4247ec2d79ef2477cb886fa688706b068119736 but for statfs64
When running rpm within qemu-arm-dynamic this could cause rpm fail with
an error like
"installing package A needs B MB on the C filesystem" depending on what
is in memory in f_flags.
https://github.com/rpm-software-management/rpm/blob/af06db1d5558870f7fb8f5c502572c2d27af5c71/lib/transaction.c#L164

Signed-off-by: Franz-Josef Haider <franz.haider@jolla.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <2e405fe7-efab-dae5-93d6-02575773fd6e@jolla.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/syscall.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 3e0f14f2e67f..cd520ae42e6d 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -9787,6 +9787,11 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
             __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]);
             __put_user(stfs.f_namelen, &target_stfs->f_namelen);
             __put_user(stfs.f_frsize, &target_stfs->f_frsize);
+#ifdef _STATFS_F_FLAGS
+            __put_user(stfs.f_flags, &target_stfs->f_flags);
+#else
+            __put_user(0, &target_stfs->f_flags);
+#endif
             memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare));
             unlock_user_struct(target_stfs, arg3, 1);
         }
-- 
2.26.2



  parent reply	other threads:[~2020-10-26 22:06 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-26 22:03 [PULL 0/8] Linux user for 5.2 patches Laurent Vivier
2020-10-26 22:03 ` [PULL 1/8] Fix stack smashing when handling PR_GET_PDEATHSIG Laurent Vivier
2020-10-26 22:03 ` Laurent Vivier [this message]
2020-10-26 22:03 ` [PULL 3/8] linux-user: update syscall_nr.h to Linux 5.9-rc7 Laurent Vivier
2020-10-26 22:03 ` [PULL 4/8] linux-user: update mips/syscall-args-o32.c.inc " Laurent Vivier
2020-10-26 22:03 ` [PULL 5/8] linux-user: update syscall.tbl " Laurent Vivier
2020-10-26 22:03 ` [PULL 6/8] linux-user: remove _sysctl Laurent Vivier
2020-10-26 22:03 ` [PULL 7/8] linux-user: correct errno returned from accept4() syscall Laurent Vivier
2020-10-26 22:03 ` [PULL 8/8] target/xtensa: enable all coprocessors for linux-user Laurent Vivier
2020-10-28 16:25 ` [PULL 0/8] Linux user for 5.2 patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201026220339.195790-3-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=franz.haider@jolla.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).