Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754620AbcJNLsm (ORCPT <rfc822;w@1wt.eu>);
        Fri, 14 Oct 2016 07:48:42 -0400
Received: from mail-qt0-f175.google.com ([209.85.216.175]:34425 "EHLO
        mail-qt0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1754246AbcJNLsd (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 14 Oct 2016 07:48:33 -0400
Message-ID: <1476445695.12134.19.camel@redhat.com>
Subject: Re: [PATCH] fs: fcntl, avoid undefined behaviour
From: Jeff Layton <jlayton@redhat.com>
To: Jiri Slaby <jslaby@suse.cz>, viro@zeniv.linux.org.uk
Cc: linux-kernel@vger.kernel.org, "J. Bruce Fields" <bfields@fieldses.org>,
        linux-fsdevel@vger.kernel.org
Date: Fri, 14 Oct 2016 07:48:15 -0400
In-Reply-To: <20161014092342.25546-1-jslaby@suse.cz>
References: <20161014092342.25546-1-jslaby@suse.cz>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1523
Lines: 48

On Fri, 2016-10-14 at 11:23 +0200, Jiri Slaby wrote:
> fcntl(0, F_SETOWN, 0x80000000) triggers:
> UBSAN: Undefined behaviour in fs/fcntl.c:118:7
> negation of -2147483648 cannot be represented in type 'int':
> CPU: 1 PID: 18261 Comm: syz-executor Not tainted 4.8.1-0-syzkaller #1
> ...
> Call Trace:
> ...
>  [<ffffffffad8f0868>] ? f_setown+0x1d8/0x200
>  [<ffffffffad8f19a9>] ? SyS_fcntl+0x999/0xf30
>  [<ffffffffaed1fb00>] ? entry_SYSCALL_64_fastpath+0x23/0xc1
> 
> Fix that by checking the arg parameter properly (against INT_MAX) and
> return immediatelly in case it is wrong. No error is returned, the
> same as in other cases.
> 
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> Cc: Jeff Layton <jlayton@poochiereds.net>
> Cc: "J. Bruce Fields" <bfields@fieldses.org>
> Cc: Alexander Viro <viro@zeniv.linux.org.uk>
> Cc: linux-fsdevel@vger.kernel.org
> ---
>  fs/fcntl.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/fs/fcntl.c b/fs/fcntl.c
> index 350a2c8cfd28..bfc3b040d956 100644
> --- a/fs/fcntl.c
> +++ b/fs/fcntl.c
> @@ -112,6 +112,10 @@ void f_setown(struct file *filp, unsigned long arg, int force)
>  	enum pid_type type;
>  	struct pid *pid;
>  	int who = arg;
> +
> +	if (arg > INT_MAX)
> +		return;
> +
>  	type = PIDTYPE_PID;
>  	if (who < 0) {
>  		type = PIDTYPE_PGID;

Might it be better to change f_setown to return int there, so you can
return -EINVAL in that case? The other caller (sock_ioctl) can also
handle an int return there too...

Thanks,
-- 
Jeff Layton <jlayton@redhat.com>