netdev - Re: [PATCH 7.x ubsan fix 3/6] net: sctp, forbid negative length

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <2d63145e-0106-b1a0-151b-5d9a9233381d@huawei.com>
Date:   Fri, 17 Nov 2017 10:35:26 +0800
From:   Kefeng Wang <wangkefeng.wang@...wei.com>
To:     <kernel.openeuler@...wei.com>
CC:     Jiri Slaby <jslaby@...e.cz>, Vlad Yasevich <vyasevich@...il.com>,
        "Neil Horman" <nhorman@...driver.com>,
        "David S. Miller" <davem@...emloft.net>,
        <linux-sctp@...r.kernel.org>, <netdev@...r.kernel.org>
Subject: Re: [PATCH 7.x ubsan fix 3/6] net: sctp, forbid negative length

sorry, please ignore...


On 2017/11/17 10:33, Kefeng Wang wrote:
> From: Jiri Slaby <jslaby@...e.cz>
>
> mainline inclusion
> from mainline-4.9
> commit a4b8e71b05c27bae6bad3bdecddbc6b68a3ad8cf
> category: bugfix
> bugzilla: 3214
> DTS: NA
> CVE: NA
>
> -------------------------------------------------
>
> Most of getsockopt handlers in net/sctp/socket.c check len against
> sizeof some structure like:
>         if (len < sizeof(int))
>                 return -EINVAL;
>
> On the first look, the check seems to be correct. But since len is int
> and sizeof returns size_t, int gets promoted to unsigned size_t too. So
> the test returns false for negative lengths. Yes, (-1 < sizeof(long)) is
> false.
>
> Fix this in sctp by explicitly checking len < 0 before any getsockopt
> handler is called.
>
> Note that sctp_getsockopt_events already handled the negative case.
> Since we added the < 0 check elsewhere, this one can be removed.
>
> If not checked, this is the result:
> UBSAN: Undefined behaviour in ../mm/page_alloc.c:2722:19
> shift exponent 52 is too large for 32-bit type 'int'
> CPU: 1 PID: 24535 Comm: syz-executor Not tainted 4.8.1-0-syzkaller #1
> Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.9.1-0-gb3ef39f-prebuilt.qemu-project.org 04/01/2014
>  0000000000000000 ffff88006d99f2a8 ffffffffb2f7bdea 0000000041b58ab3
>  ffffffffb4363c14 ffffffffb2f7bcde ffff88006d99f2d0 ffff88006d99f270
>  0000000000000000 0000000000000000 0000000000000034 ffffffffb5096422
> Call Trace:
>  [<ffffffffb3051498>] ? __ubsan_handle_shift_out_of_bounds+0x29c/0x300
> ...
>  [<ffffffffb273f0e4>] ? kmalloc_order+0x24/0x90
>  [<ffffffffb27416a4>] ? kmalloc_order_trace+0x24/0x220
>  [<ffffffffb2819a30>] ? __kmalloc+0x330/0x540
>  [<ffffffffc18c25f4>] ? sctp_getsockopt_local_addrs+0x174/0xca0 [sctp]
>  [<ffffffffc18d2bcd>] ? sctp_getsockopt+0x10d/0x1b0 [sctp]
>  [<ffffffffb37c1219>] ? sock_common_getsockopt+0xb9/0x150
>  [<ffffffffb37be2f5>] ? SyS_getsockopt+0x1a5/0x270
>
> Signed-off-by: Jiri Slaby <jslaby@...e.cz>
> Cc: Vlad Yasevich <vyasevich@...il.com>
> Cc: Neil Horman <nhorman@...driver.com>
> Cc: "David S. Miller" <davem@...emloft.net>
> Cc: linux-sctp@...r.kernel.org
> Cc: netdev@...r.kernel.org
> Acked-by: Neil Horman <nhorman@...driver.com>
> Signed-off-by: David S. Miller <davem@...emloft.net>
> (cherry picked from commit a4b8e71b05c27bae6bad3bdecddbc6b68a3ad8cf)
> Signed-off-by: Kefeng Wang <wangkefeng.wang@...wei.com>
> ---
>  net/sctp/socket.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index 425a1a3..3a42f98 100644
> --- a/net/sctp/socket.c
> +++ b/net/sctp/socket.c
> @@ -4589,7 +4589,7 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
>  static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
>  				  int __user *optlen)
>  {
> -	if (len <= 0)
> +	if (len == 0)
>  		return -EINVAL;
>  	if (len > sizeof(struct sctp_event_subscribe))
>  		len = sizeof(struct sctp_event_subscribe);
> @@ -6252,6 +6252,9 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname,
>  	if (get_user(len, optlen))
>  		return -EFAULT;
>  
> +	if (len < 0)
> +		return -EINVAL;
> +
>  	lock_sock(sk);
>  
>  	switch (optname) {