[PULL 0/5] Linux user for 6.0 patches

[PULL 0/5] Linux user for 6.0 patches

[Laurent Vivier]

The following changes since commit 3f8d1885e48e4d72eab0688f604de62e0aea7a38:

  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210311-pull-request'=
 into staging (2021-03-12 13:53:44 +0000)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request

for you to fetch changes up to 0266e8e3b3981b492e82be20bb97e8ed9792ed00:

  linux-user/elfload: fix address calculation in fallback scenario (2021-03-1=
3 10:45:11 +0100)

----------------------------------------------------------------
linux-user pull request 20210313

- fix elfload
- fix executable page of /proc/self/maps
- add preserve-arg[0] support for binfmt_misc

----------------------------------------------------------------

Laurent Vivier (1):
  linux-user: manage binfmt-misc preserve-arg[0] flag

Nicolas Surbayrole (1):
  linux-user: Fix executable page of /proc/self/maps

Vincent Fazio (3):
  linux-user/elfload: munmap proper address in pgd_find_hole_fallback
  linux-user/elfload: do not assume MAP_FIXED_NOREPLACE kernel support
  linux-user/elfload: fix address calculation in fallback scenario

 linux-user/elfload.c        |  8 +++----
 linux-user/main.c           | 24 ++++++++++++++++++++
 linux-user/syscall.c        |  6 ++---
 scripts/qemu-binfmt-conf.sh | 44 +++++++++++++++++++++++--------------
 4 files changed, 58 insertions(+), 24 deletions(-)

--=20
2.29.2

[PULL 1/5] linux-user: Fix executable page of /proc/self/maps

[Laurent Vivier]

From: Nicolas Surbayrole <nsurbayrole@quarkslab.com>

The guest binary and libraries are not always map with the
executable bit in the host process. The guest may read a
/proc/self/maps with no executable address range. The
perm fields should be based on the guest permission inside
Qemu.

Signed-off-by: Nicolas Surbayrole <nsurbayrole@quarkslab.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210308091959.986540-1-nsurbayrole@quarkslab.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/syscall.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 9522f603aad6..1e508576c73e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7890,9 +7890,9 @@ static int open_self_maps(void *cpu_env, int fd)
             count = dprintf(fd, TARGET_ABI_FMT_ptr "-" TARGET_ABI_FMT_ptr
                             " %c%c%c%c %08" PRIx64 " %s %"PRId64,
                             h2g(min), h2g(max - 1) + 1,
-                            e->is_read ? 'r' : '-',
-                            e->is_write ? 'w' : '-',
-                            e->is_exec ? 'x' : '-',
+                            (flags & PAGE_READ) ? 'r' : '-',
+                            (flags & PAGE_WRITE_ORG) ? 'w' : '-',
+                            (flags & PAGE_EXEC) ? 'x' : '-',
                             e->is_priv ? 'p' : '-',
                             (uint64_t) e->offset, e->dev, e->inode);
             if (path) {
-- 
2.29.2

[PULL 2/5] linux-user: manage binfmt-misc preserve-arg[0] flag

[Laurent Vivier]

Add --preserve-argv0 in qemu-binfmt-conf.sh to configure the preserve-argv0
flag.

This patch allows to use new flag in AT_FLAGS to detect if
preserve-argv0 is configured for this interpreter:
argv[0] (the full pathname provided by binfmt-misc) is removed and
replaced by argv[1] (the original argv[0] provided by binfmt-misc when
'P'/preserve-arg[0] is set)

For instance with this patch and kernel support for AT_FLAGS:

  $ sudo chroot m68k-chroot sh -c 'echo $0'
  sh

without this patch:

  $ sudo chroot m68k-chroot sh -c 'echo $0'
  /usr/bin/sh

The new flag is available in kernel (v5.12) since:
2347961b11d4 ("binfmt_misc: pass binfmt_misc flags to the interpreter")

This can be tested with something like:

  # cp ..../qemu-ppc /chroot/powerpc/jessie

  # qemu-binfmt-conf.sh --qemu-path / --systemd ppc --credential yes \
                        --persistent no --preserve-argv0 yes
  # systemctl restart systemd-binfmt.service
  # cat /proc/sys/fs/binfmt_misc/qemu-ppc
  enabled
  interpreter //qemu-ppc
  flags: POC
  offset 0
  magic 7f454c4601020100000000000000000000020014
  mask ffffffffffffff00fffffffffffffffffffeffff
  # chroot /chroot/powerpc/jessie  sh -c 'echo $0'
  sh

  # qemu-binfmt-conf.sh --qemu-path / --systemd ppc --credential yes \
                        --persistent no --preserve-argv0 no
  # systemctl restart systemd-binfmt.service
  # cat /proc/sys/fs/binfmt_misc/qemu-ppc
  enabled
  interpreter //qemu-ppc
  flags: OC
  offset 0
  magic 7f454c4601020100000000000000000000020014
  mask ffffffffffffff00fffffffffffffffffffeffff
  # chroot /chroot/powerpc/jessie  sh -c 'echo $0'
  /bin/sh

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210222105004.1642234-1-laurent@vivier.eu>
---
 linux-user/main.c           | 24 ++++++++++++++++++++
 scripts/qemu-binfmt-conf.sh | 44 +++++++++++++++++++++++--------------
 2 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/linux-user/main.c b/linux-user/main.c
index 4f4746dce825..f956afccab62 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -26,6 +26,7 @@
 #include <sys/syscall.h>
 #include <sys/resource.h>
 #include <sys/shm.h>
+#include <linux/binfmts.h>
 
 #include "qapi/error.h"
 #include "qemu.h"
@@ -49,6 +50,11 @@
 #include "cpu_loop-common.h"
 #include "crypto/init.h"
 
+#ifndef AT_FLAGS_PRESERVE_ARGV0
+#define AT_FLAGS_PRESERVE_ARGV0_BIT 0
+#define AT_FLAGS_PRESERVE_ARGV0 (1 << AT_FLAGS_PRESERVE_ARGV0_BIT)
+#endif
+
 char *exec_path;
 
 int singlestep;
@@ -632,6 +638,7 @@ int main(int argc, char **argv, char **envp)
     int execfd;
     int log_mask;
     unsigned long max_reserved_va;
+    bool preserve_argv0;
 
     error_init(argv[0]);
     module_call_init(MODULE_INIT_TRACE);
@@ -688,6 +695,9 @@ int main(int argc, char **argv, char **envp)
 
     init_qemu_uname_release();
 
+    /*
+     * Manage binfmt-misc open-binary flag
+     */
     execfd = qemu_getauxval(AT_EXECFD);
     if (execfd == 0) {
         execfd = open(exec_path, O_RDONLY);
@@ -697,6 +707,20 @@ int main(int argc, char **argv, char **envp)
         }
     }
 
+    /*
+     * get binfmt_misc flags
+     */
+    preserve_argv0 = !!(qemu_getauxval(AT_FLAGS) & AT_FLAGS_PRESERVE_ARGV0);
+
+    /*
+     * Manage binfmt-misc preserve-arg[0] flag
+     *    argv[optind]     full path to the binary
+     *    argv[optind + 1] original argv[0]
+     */
+    if (optind + 1 < argc && preserve_argv0) {
+        optind++;
+    }
+
     if (cpu_model == NULL) {
         cpu_model = cpu_get_model(get_elf_eflags(execfd));
     }
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 7b5d54b88741..573b5dc6acd7 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -178,25 +178,27 @@ usage() {
 Usage: qemu-binfmt-conf.sh [--qemu-path PATH][--debian][--systemd CPU]
                            [--help][--credential yes|no][--exportdir PATH]
                            [--persistent yes|no][--qemu-suffix SUFFIX]
+                           [--preserve-argv0 yes|no]
 
        Configure binfmt_misc to use qemu interpreter
 
-       --help:        display this usage
-       --qemu-path:   set path to qemu interpreter ($QEMU_PATH)
-       --qemu-suffix: add a suffix to the default interpreter name
-       --debian:      don't write into /proc,
-                      instead generate update-binfmts templates
-       --systemd:     don't write into /proc,
-                      instead generate file for systemd-binfmt.service
-                      for the given CPU. If CPU is "ALL", generate a
-                      file for all known cpus
-       --exportdir:   define where to write configuration files
-                      (default: $SYSTEMDDIR or $DEBIANDIR)
-       --credential:  if yes, credential and security tokens are
-                      calculated according to the binary to interpret
-       --persistent:  if yes, the interpreter is loaded when binfmt is
-                      configured and remains in memory. All future uses
-                      are cloned from the open file.
+       --help:          display this usage
+       --qemu-path:     set path to qemu interpreter ($QEMU_PATH)
+       --qemu-suffix:   add a suffix to the default interpreter name
+       --debian:        don't write into /proc,
+                        instead generate update-binfmts templates
+       --systemd:       don't write into /proc,
+                        instead generate file for systemd-binfmt.service
+                        for the given CPU. If CPU is "ALL", generate a
+                        file for all known cpus
+       --exportdir:     define where to write configuration files
+                        (default: $SYSTEMDDIR or $DEBIANDIR)
+       --credential:    if yes, credential and security tokens are
+                        calculated according to the binary to interpret
+       --persistent:    if yes, the interpreter is loaded when binfmt is
+                        configured and remains in memory. All future uses
+                        are cloned from the open file.
+       --preserve-argv0 preserve argv[0]
 
     To import templates with update-binfmts, use :
 
@@ -269,6 +271,9 @@ qemu_generate_register() {
     if [ "$PERSISTENT" = "yes" ] ; then
         flags="${flags}F"
     fi
+    if [ "$PRESERVE_ARG0" = "yes" ] ; then
+        flags="${flags}P"
+    fi
 
     echo ":qemu-$cpu:M::$magic:$mask:$qemu:$flags"
 }
@@ -330,9 +335,10 @@ DEBIANDIR="/usr/share/binfmts"
 QEMU_PATH=/usr/local/bin
 CREDENTIAL=no
 PERSISTENT=no
+PRESERVE_ARG0=no
 QEMU_SUFFIX=""
 
-options=$(getopt -o ds:Q:S:e:hc:p: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent: -- "$@")
+options=$(getopt -o ds:Q:S:e:hc:p:g: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent:,preserve-argv0: -- "$@")
 eval set -- "$options"
 
 while true ; do
@@ -388,6 +394,10 @@ while true ; do
         shift
         PERSISTENT="$1"
         ;;
+    -g|--preserve-argv0)
+        shift
+        PRESERVE_ARG0="$1"
+        ;;
     *)
         break
         ;;
-- 
2.29.2

[PULL 3/5] linux-user/elfload: munmap proper address in pgd_find_hole_fallback

[Laurent Vivier]

From: Vincent Fazio <vfazio@gmail.com>

Previously, if the build host's libc did not define MAP_FIXED_NOREPLACE
or if the running kernel didn't support that flag, it was possible for
pgd_find_hole_fallback to munmap an incorrect address which could lead to
SIGSEGV if the range happened to overlap with the mapped address of the
QEMU binary.

  mmap(0x1000, 22261224, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE, -1, 0) = 0x7f889d331000
  munmap(0x1000, 22261224)                = 0
  --- SIGSEGV {si_signo=SIGSEGV, si_code=SEGV_MAPERR, si_addr=0x84b817} ---
  ++ killed by SIGSEGV +++

Now, always munmap the address returned by mmap.

Fixes: 2667e069e7b5 ("linux-user: don't use MAP_FIXED in pgd_find_hole_fallback")
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210131061849.12615-1-vfazio@xes-inc.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/elfload.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 140a9716324d..174ee7bad677 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2209,7 +2209,7 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t guest_size, uintptr_t brk,
             void * mmap_start = mmap((void *) align_start, guest_size,
                                      PROT_NONE, flags, -1, 0);
             if (mmap_start != MAP_FAILED) {
-                munmap((void *) align_start, guest_size);
+                munmap(mmap_start, guest_size);
                 if (MAP_FIXED_NOREPLACE != 0 ||
                     mmap_start == (void *) align_start) {
                     return (uintptr_t) mmap_start + offset;
-- 
2.29.2

[PULL 4/5] linux-user/elfload: do not assume MAP_FIXED_NOREPLACE kernel support

[Laurent Vivier]

From: Vincent Fazio <vfazio@gmail.com>

Previously, pgd_find_hole_fallback assumed that if the build host's libc
had MAP_FIXED_NOREPLACE defined that the address returned by mmap would
match the requested address. This is not a safe assumption for Linux
kernels prior to 4.17

Now, we always compare mmap's resultant address with the requested
address and no longer short-circuit based on MAP_FIXED_NOREPLACE.

Fixes: 2667e069e7b5 ("linux-user: don't use MAP_FIXED in pgd_find_hole_fallback")
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210131061930.14554-1-vfazio@xes-inc.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/elfload.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 174ee7bad677..e525901659d4 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2210,8 +2210,7 @@ static uintptr_t pgd_find_hole_fallback(uintptr_t guest_size, uintptr_t brk,
                                      PROT_NONE, flags, -1, 0);
             if (mmap_start != MAP_FAILED) {
                 munmap(mmap_start, guest_size);
-                if (MAP_FIXED_NOREPLACE != 0 ||
-                    mmap_start == (void *) align_start) {
+                if (mmap_start == (void *) align_start) {
                     return (uintptr_t) mmap_start + offset;
                 }
             }
-- 
2.29.2

[PULL 5/5] linux-user/elfload: fix address calculation in fallback scenario

[Laurent Vivier]

From: Vincent Fazio <vfazio@gmail.com>

Previously, guest_loaddr was not taken into account when returning an
address from pgb_find_hole when /proc/self/maps was unavailable which
caused an improper guest_base address to be calculated.

This could cause a SIGSEGV later in load_elf_image -> target_mmap for
ET_EXEC type images since the mmap MAP_FIXED flag is specified which
could clobber existing mappings at the address returnd by g2h().

  mmap(0xd87000, 16846912, PROT_NONE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_NORESERVE|0x100000, -1, 0) = 0xd87000
  munmap(0xd87000, 16846912)              = 0
  write(2, "Locating guest address space @ 0"..., 40Locating guest address space @ 0xd87000) = 40
  mmap(0x1187000, 16850944, PROT_NONE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_NORESERVE, -1, 0) = 0x1187000
  --- SIGSEGV {si_signo=SIGSEGV, si_code=SEGV_ACCERR, si_addr=0x2188310} ---
  +++ killed by SIGSEGV +++

Now, pgd_find_hole accounts for guest_loaddr in this scenario.

Fixes: ad592e37dfcc ("linux-user: provide fallback pgd_find_hole for bare chroots")
Signed-off-by: Vincent Fazio <vfazio@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210131061948.15990-1-vfazio@xes-inc.com>
[lv: updated it to check if ret == -1]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/elfload.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index e525901659d4..c6731013fde2 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2235,7 +2235,8 @@ static uintptr_t pgb_find_hole(uintptr_t guest_loaddr, uintptr_t guest_size,
     brk = (uintptr_t)sbrk(0);
 
     if (!maps) {
-        return pgd_find_hole_fallback(guest_size, brk, align, offset);
+        ret = pgd_find_hole_fallback(guest_size, brk, align, offset);
+        return ret == -1 ? -1 : ret - guest_loaddr;
     }
 
     /* The first hole is before the first map entry. */
-- 
2.29.2

Re: [PULL 0/5] Linux user for 6.0 patches

[no-reply]

Patchew URL: https://patchew.org/QEMU/20210313094747.2966948-1-laurent@vivier.eu/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Type: series
Message-id: 20210313094747.2966948-1-laurent@vivier.eu
Subject: [PULL 0/5] Linux user for 6.0 patches

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 - [tag update]      patchew/20210311172459.990281-1-pbonzini@redhat.com -> patchew/20210311172459.990281-1-pbonzini@redhat.com
 - [tag update]      patchew/20210312131921.421023-1-kwolf@redhat.com -> patchew/20210312131921.421023-1-kwolf@redhat.com
 * [new tag]         patchew/20210313094747.2966948-1-laurent@vivier.eu -> patchew/20210313094747.2966948-1-laurent@vivier.eu
Switched to a new branch 'test'
3e3034f linux-user/elfload: fix address calculation in fallback scenario
4a57dfc linux-user/elfload: do not assume MAP_FIXED_NOREPLACE kernel support
f1f59a2 linux-user/elfload: munmap proper address in pgd_find_hole_fallback
e042e77 linux-user: manage binfmt-misc preserve-arg[0] flag
8a622c5 linux-user: Fix executable page of /proc/self/maps

=== OUTPUT BEGIN ===
1/5 Checking commit 8a622c57ba0b (linux-user: Fix executable page of /proc/self/maps)
2/5 Checking commit e042e77f79f4 (linux-user: manage binfmt-misc preserve-arg[0] flag)
ERROR: line over 90 characters
#196: FILE: scripts/qemu-binfmt-conf.sh:341:
+options=$(getopt -o ds:Q:S:e:hc:p:g: -l debian,systemd:,qemu-path:,qemu-suffix:,exportdir:,help,credential:,persistent:,preserve-argv0: -- "$@")

total: 1 errors, 0 warnings, 127 lines checked

Patch 2/5 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

3/5 Checking commit f1f59a2da0c6 (linux-user/elfload: munmap proper address in pgd_find_hole_fallback)
4/5 Checking commit 4a57dfc9849e (linux-user/elfload: do not assume MAP_FIXED_NOREPLACE kernel support)
5/5 Checking commit 3e3034ff2101 (linux-user/elfload: fix address calculation in fallback scenario)
=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20210313094747.2966948-1-laurent@vivier.eu/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [PULL 0/5] Linux user for 6.0 patches

[Peter Maydell]

On Sat, 13 Mar 2021 at 09:50, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 3f8d1885e48e4d72eab0688f604de62e0aea7a38:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210311-pull-request'=
>  into staging (2021-03-12 13:53:44 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>
> for you to fetch changes up to 0266e8e3b3981b492e82be20bb97e8ed9792ed00:
>
>   linux-user/elfload: fix address calculation in fallback scenario (2021-03-1=
> 3 10:45:11 +0100)
>
> ----------------------------------------------------------------
> linux-user pull request 20210313
>
> - fix elfload
> - fix executable page of /proc/self/maps
> - add preserve-arg[0] support for binfmt_misc
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM

Re: [PULL 0/5] Linux user for 6.0 patches

[Peter Maydell]

On Thu, 21 Jan 2021 at 12:43, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
> 9-1' into staging (2021-01-19 15:47:23 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>
> for you to fetch changes up to b1d2e476e94cb215d9e19fef1049d413b414ffc2:
>
>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-21 13:=
> 27:34 +0100)
>
> ----------------------------------------------------------------
> linux-user pull request 20210119-v3
>
> Remove obsolete F_SHLCK and F_EXLCK translation
> Update sockopt
> Add F_ADD_SEALS and F_GET_SEALS


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM

[PULL 0/5] Linux user for 6.0 patches

[Laurent Vivier]

The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
9-1' into staging (2021-01-19 15:47:23 +0000)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request

for you to fetch changes up to b1d2e476e94cb215d9e19fef1049d413b414ffc2:

  linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-21 13:=
27:34 +0100)

----------------------------------------------------------------
linux-user pull request 20210119-v3

Remove obsolete F_SHLCK and F_EXLCK translation
Update sockopt
Add F_ADD_SEALS and F_GET_SEALS

----------------------------------------------------------------

Michael Forney (1):
  linux-user: Remove obsolete F_SHLCK and F_EXLCK translation

Shu-Chun Weng (4):
  linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls
  linux-user: add missing UDP get/setsockopt option
  linux-user: add missing IPv6 get/setsockopt option
  linux-user: Add IPv6 options to do_print_sockopt()

 linux-user/alpha/target_fcntl.h |   2 -
 linux-user/generic/fcntl.h      |   5 --
 linux-user/strace.c             | 154 ++++++++++++++++++++++++++++++--
 linux-user/syscall.c            |  23 ++++-
 linux-user/syscall_defs.h       |  14 +--
 5 files changed, 174 insertions(+), 24 deletions(-)

--=20
2.29.2

Re: [PULL 0/5] Linux user for 6.0 patches

[Philippe Mathieu-Daudé]

On 1/21/21 12:38 PM, Philippe Mathieu-Daudé wrote:
> On 1/21/21 12:07 PM, Laurent Vivier wrote:
>> Le 21/01/2021 à 11:44, Peter Maydell a écrit :
>>> On Wed, 20 Jan 2021 at 19:56, Laurent Vivier <laurent@vivier.eu> wrote:
>>>>
>>>> The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:
>>>>
>>>>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
>>>> 9-1' into staging (2021-01-19 15:47:23 +0000)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>>>>
>>>> for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:
>>>>
>>>>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
>>>> 26:46 +0100)
>>>>
>>>> ----------------------------------------------------------------
>>>> linux-user pull request 20210119-v2
>>>>
>>>> Remove obsolete F_SHLCK and F_EXLCK translation
>>>> Update sockopt
>>>> Add F_ADD_SEALS and F_GET_SEALS
>>>>
>>> Now fails with:
>>>
>>> ../../linux-user/strace.c: In function ‘do_print_sockopt’:
>>> ../../linux-user/strace.c:2831:14: error: ‘IPV6_ADDR_PREFERENCES’
>>> undeclared (first use in this function)
>>>          case IPV6_ADDR_PREFERENCES:

I could reproduce building qemu-ppc64 (--target-list=ppc64-linux-user).

> I checked on CentOS7 and this part isn't compiled because
> TARGET_NR_socketcall is not defined, but I only build the
> x86_64-linux-user target there.
> 
>>
>> Probably the same cause, in a different file.
>>
>> This should fix the problem.
>>
>> diff --git a/linux-user/strace.c b/linux-user/strace.c
>> index bc3bb6b2f949..7b43668b9b0e 100644
>> --- a/linux-user/strace.c
>> +++ b/linux-user/strace.c
>> @@ -11,6 +11,7 @@
>>  #include <netinet/udp.h>
>>  #include <linux/if_packet.h>
>>  #include <linux/netlink.h>
>> +#include <linux/in6.h>

This build with your fix:

Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>>  #include <sched.h>
>>  #include "qemu.h"
> 
> Sounds good.
> 
>>
>> I will try to reproduce it before re-sending the PR.
>>
>> Thanks,
>> Laurent
>>
> 
> 

Re: [PULL 0/5] Linux user for 6.0 patches

[Philippe Mathieu-Daudé]

On 1/21/21 12:07 PM, Laurent Vivier wrote:
> Le 21/01/2021 à 11:44, Peter Maydell a écrit :
>> On Wed, 20 Jan 2021 at 19:56, Laurent Vivier <laurent@vivier.eu> wrote:
>>>
>>> The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:
>>>
>>>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
>>> 9-1' into staging (2021-01-19 15:47:23 +0000)
>>>
>>> are available in the Git repository at:
>>>
>>>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>>>
>>> for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:
>>>
>>>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
>>> 26:46 +0100)
>>>
>>> ----------------------------------------------------------------
>>> linux-user pull request 20210119-v2
>>>
>>> Remove obsolete F_SHLCK and F_EXLCK translation
>>> Update sockopt
>>> Add F_ADD_SEALS and F_GET_SEALS
>>>
>> Now fails with:
>>
>> ../../linux-user/strace.c: In function ‘do_print_sockopt’:
>> ../../linux-user/strace.c:2831:14: error: ‘IPV6_ADDR_PREFERENCES’
>> undeclared (first use in this function)
>>          case IPV6_ADDR_PREFERENCES:

I checked on CentOS7 and this part isn't compiled because
TARGET_NR_socketcall is not defined, but I only build the
x86_64-linux-user target there.

> 
> Probably the same cause, in a different file.
> 
> This should fix the problem.
> 
> diff --git a/linux-user/strace.c b/linux-user/strace.c
> index bc3bb6b2f949..7b43668b9b0e 100644
> --- a/linux-user/strace.c
> +++ b/linux-user/strace.c
> @@ -11,6 +11,7 @@
>  #include <netinet/udp.h>
>  #include <linux/if_packet.h>
>  #include <linux/netlink.h>
> +#include <linux/in6.h>
>  #include <sched.h>
>  #include "qemu.h"

Sounds good.

> 
> I will try to reproduce it before re-sending the PR.
> 
> Thanks,
> Laurent
> 

Re: [PULL 0/5] Linux user for 6.0 patches

[Laurent Vivier]

Le 21/01/2021 à 11:44, Peter Maydell a écrit :
> On Wed, 20 Jan 2021 at 19:56, Laurent Vivier <laurent@vivier.eu> wrote:
>>
>> The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:
>>
>>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
>> 9-1' into staging (2021-01-19 15:47:23 +0000)
>>
>> are available in the Git repository at:
>>
>>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>>
>> for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:
>>
>>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
>> 26:46 +0100)
>>
>> ----------------------------------------------------------------
>> linux-user pull request 20210119-v2
>>
>> Remove obsolete F_SHLCK and F_EXLCK translation
>> Update sockopt
>> Add F_ADD_SEALS and F_GET_SEALS
>>
> Now fails with:
> 
> ../../linux-user/strace.c: In function ‘do_print_sockopt’:
> ../../linux-user/strace.c:2831:14: error: ‘IPV6_ADDR_PREFERENCES’
> undeclared (first use in this function)
>          case IPV6_ADDR_PREFERENCES:

Probably the same cause, in a different file.

This should fix the problem.

diff --git a/linux-user/strace.c b/linux-user/strace.c
index bc3bb6b2f949..7b43668b9b0e 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -11,6 +11,7 @@
 #include <netinet/udp.h>
 #include <linux/if_packet.h>
 #include <linux/netlink.h>
+#include <linux/in6.h>
 #include <sched.h>
 #include "qemu.h"

I will try to reproduce it before re-sending the PR.

Thanks,
Laurent

Re: [PULL 0/5] Linux user for 6.0 patches

[Peter Maydell]

On Wed, 20 Jan 2021 at 19:56, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:
>
>   Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
> 9-1' into staging (2021-01-19 15:47:23 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>
> for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:
>
>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
> 26:46 +0100)
>
> ----------------------------------------------------------------
> linux-user pull request 20210119-v2
>
> Remove obsolete F_SHLCK and F_EXLCK translation
> Update sockopt
> Add F_ADD_SEALS and F_GET_SEALS
>
Now fails with:

../../linux-user/strace.c: In function ‘do_print_sockopt’:
../../linux-user/strace.c:2831:14: error: ‘IPV6_ADDR_PREFERENCES’
undeclared (first use in this function)
         case IPV6_ADDR_PREFERENCES:
              ^

thanks
-- PMM

[PULL 0/5] Linux user for 6.0 patches

[Laurent Vivier]

The following changes since commit 48202c712412c803ddb56365c7bca322aa4e7506:

  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-2021011=
9-1' into staging (2021-01-19 15:47:23 +0000)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request

for you to fetch changes up to 8a7e49050b8d5477a567b0ec5d764a564481abdb:

  linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-20 18:=
26:46 +0100)

----------------------------------------------------------------
linux-user pull request 20210119-v2

Remove obsolete F_SHLCK and F_EXLCK translation
Update sockopt
Add F_ADD_SEALS and F_GET_SEALS

----------------------------------------------------------------

Michael Forney (1):
  linux-user: Remove obsolete F_SHLCK and F_EXLCK translation

Shu-Chun Weng (4):
  linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls
  linux-user: add missing UDP get/setsockopt option
  linux-user: add missing IPv6 get/setsockopt option
  linux-user: Add IPv6 options to do_print_sockopt()

 linux-user/alpha/target_fcntl.h |   2 -
 linux-user/generic/fcntl.h      |   5 --
 linux-user/strace.c             | 153 ++++++++++++++++++++++++++++++--
 linux-user/syscall.c            |  23 ++++-
 linux-user/syscall_defs.h       |  14 +--
 5 files changed, 173 insertions(+), 24 deletions(-)

--=20
2.29.2

Re: [PULL 0/5] Linux user for 6.0 patches

[Peter Maydell]

On Tue, 19 Jan 2021 at 18:27, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit e43d564fa3a0d1e133935c8180ad4f4ccf699f33:
>
>   Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-p=
> ull-request' into staging (2021-01-18 15:19:06 +0000)
>
> are available in the Git repository at:
>
>   git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request
>
> for you to fetch changes up to 07e6a3d4e5160955203b82d7ed0d8f523b6b8963:
>
>   linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-19 18:=
> 53:58 +0100)
>
> ----------------------------------------------------------------
> linux-user pull request 20210119
>
> Remove obsolete F_SHLCK and F_EXLCK translation
> Update sockopt
> Add F_ADD_SEALS and F_GET_SEALS

Hi; this fails to compile on the ppc64 box; looks like the usual
"its system includes happen to be a bit elderly" reason:
../../linux-user/syscall.c: In function ‘do_setsockopt’:
../../linux-user/syscall.c:2276:14: error: ‘IPV6_ADDR_PREFERENCES’
undeclared (first use in this function)
         case IPV6_ADDR_PREFERENCES:
              ^
../../linux-user/syscall.c:2276:14: note: each undeclared identifier
is reported only once for each function it appears in
../../linux-user/syscall.c: In function ‘do_getsockopt’:
../../linux-user/syscall.c:2931:14: error: ‘IPV6_ADDR_PREFERENCES’
undeclared (first use in this function)
         case IPV6_ADDR_PREFERENCES:
              ^

(Maybe we should think about some mechanism for getting constant
values from a local copy of the kernel headers by extending
the linux-headers scheme? It would let us cut down on the
ifdeffery...)

thanks
-- PMM

[PULL 0/5] Linux user for 6.0 patches

[Laurent Vivier]

The following changes since commit e43d564fa3a0d1e133935c8180ad4f4ccf699f33:

  Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-p=
ull-request' into staging (2021-01-18 15:19:06 +0000)

are available in the Git repository at:

  git://github.com/vivier/qemu.git tags/linux-user-for-6.0-pull-request

for you to fetch changes up to 07e6a3d4e5160955203b82d7ed0d8f523b6b8963:

  linux-user: Remove obsolete F_SHLCK and F_EXLCK translation (2021-01-19 18:=
53:58 +0100)

----------------------------------------------------------------
linux-user pull request 20210119

Remove obsolete F_SHLCK and F_EXLCK translation
Update sockopt
Add F_ADD_SEALS and F_GET_SEALS

----------------------------------------------------------------

Michael Forney (1):
  linux-user: Remove obsolete F_SHLCK and F_EXLCK translation

Shu-Chun Weng (4):
  linux-user: Support F_ADD_SEALS and F_GET_SEALS fcntls
  linux-user: add missing UDP get/setsockopt option
  linux-user: add missing IPv6 get/setsockopt option
  linux-user: Add IPv6 options to do_print_sockopt()

 linux-user/alpha/target_fcntl.h |   2 -
 linux-user/generic/fcntl.h      |   5 --
 linux-user/strace.c             | 153 ++++++++++++++++++++++++++++++--
 linux-user/syscall.c            |  22 ++++-
 linux-user/syscall_defs.h       |  14 +--
 5 files changed, 172 insertions(+), 24 deletions(-)

--=20
2.29.2