Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (1.0)
Subject: Re: [PATCH v2] prctl: fix compat handling for prctl
From:   Andy Lutomirski <luto@amacapital.net>
In-Reply-To: <1524099966-43544-1-git-send-email-huawei.libin@huawei.com>
Date:   Wed, 18 Apr 2018 21:35:58 -0400
Cc:     Al Viro <viro@ZenIV.linux.org.uk>,
        "Eric W. Biederman" <ebiederm@xmission.com>,
        Dominik Brodowski <linux@dominikbrodowski.net>,
        Andrew Morton <akpm@linux-foundation.org>,
        Andy Lutomirski <luto@kernel.org>,
        linux-kernel@vger.kernel.org, guohanjun@huawei.com
Content-Transfer-Encoding: quoted-printable
Message-Id: <0E66E9A1-9562-481C-A66C-9C518ADE29B6@amacapital.net>
References: <1524099966-43544-1-git-send-email-huawei.libin@huawei.com>
To:     Li Bin <huawei.libin@huawei.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


> On Apr 18, 2018, at 9:06 PM, Li Bin <huawei.libin@huawei.com> wrote:
>=20
> The member auxv in prctl_mm_map structure which be shared with
> userspace is pointer type, but the kernel supporting COMPAT didn't
> handle it. This patch fix the compat handling for prctl syscall.
>=20
> Signed-off-by: Li Bin <huawei.libin@huawei.com>
> ---
> kernel/sys.c | 42 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>=20
> diff --git a/kernel/sys.c b/kernel/sys.c
> index ad69218..d4259938 100644
> --- a/kernel/sys.c
> +++ b/kernel/sys.c
> @@ -1969,6 +1969,26 @@ static int validate_prctl_map(struct prctl_mm_map *=
prctl_map)
> }
>=20
> #ifdef CONFIG_CHECKPOINT_RESTORE
> +
> +#ifdef CONFIG_COMPAT
> +struct compat_prctl_mm_map {
> +    __u64   start_code;     /* code section bounds */
> +    __u64   end_code;
> +    __u64   start_data;     /* data section bounds */
> +    __u64   end_data;
> +    __u64   start_brk;      /* heap for brk() syscall */
> +    __u64   brk;
> +    __u64   start_stack;        /* stack starts at */
> +    __u64   arg_start;      /* command line arguments bounds */
> +    __u64   arg_end;
> +    __u64   env_start;      /* environment variables bounds */
> +    __u64   env_end;
> +    compat_uptr_t   auxv;   /* auxiliary vector */
> +    __u32   auxv_size;      /* vector size */
> +    __u32   exe_fd;         /* /proc/$pid/exe link file */
> +};
> +#endif
> +
> static int prctl_set_mm_map(int opt, const void __user *addr, unsigned lon=
g data_size)
> {
>    struct prctl_mm_map prctl_map =3D { .exe_fd =3D (u32)-1, };
> @@ -1986,6 +2006,28 @@ static int prctl_set_mm_map(int opt, const void __u=
ser *addr, unsigned long data
>    if (data_size !=3D sizeof(prctl_map))
>        return -EINVAL;
>=20
> +#ifdef CONFIG_COMPAT
> +    if (in_compat_syscall()) {
> +        struct compat_prctl_mm_map prctl_map32;
> +        if (copy_from_user(&prctl_map32, addr, sizeof(prctl_map32)))
> +            return -EFAULT;
> +
> +        prctl_map.start_code =3D prctl_map32.start_code;
> +        prctl_map.end_code =3D prctl_map32.end_code;
> +        prctl_map.start_data =3D prctl_map32.start_data;
> +        prctl_map.end_data =3D prctl_map32.end_data;
> +        prctl_map.start_brk =3D prctl_map32.start_brk;
> +        prctl_map.brk =3D prctl_map32.brk;
> +        prctl_map.start_stack =3D prctl_map32.start_stack;
> +        prctl_map.arg_start =3D prctl_map32.arg_start;
> +        prctl_map.arg_end =3D prctl_map32.arg_end;
> +        prctl_map.env_start =3D prctl_map32.env_start;
> +        prctl_map.env_end =3D prctl_map32.env_end;
> +        prctl_map.auxv =3D compat_ptr(prctl_map32.auxv);
> +        prctl_map.auxv_size =3D prctl_map32.auxv_size;
> +        prctl_map.exe_fd =3D prctl_map32.exe_fd;
> +    } else
> +#endif
>    if (copy_from_user(&prctl_map, addr, sizeof(prctl_map)))
>        return -EFAULT;
>=20
> --=20
> 1.7.12.4
>=20