Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753622AbcJNJYf (ORCPT <rfc822;w@1wt.eu>);
        Fri, 14 Oct 2016 05:24:35 -0400
Received: from mx2.suse.de ([195.135.220.15]:42204 "EHLO mx2.suse.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752110AbcJNJYW (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 14 Oct 2016 05:24:22 -0400
From: Jiri Slaby <jslaby@suse.cz>
To: viro@zeniv.linux.org.uk
Cc: linux-kernel@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>,
        linux-fsdevel@vger.kernel.org
Subject: [PATCH] fs: pipe, fix undefined behaviour
Date: Fri, 14 Oct 2016 11:23:42 +0200
Message-Id: <20161014092342.25546-2-jslaby@suse.cz>
X-Mailer: git-send-email 2.10.1
In-Reply-To: <20161014092342.25546-1-jslaby@suse.cz>
References: <20161014092342.25546-1-jslaby@suse.cz>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1269
Lines: 40

echo | ./program
where ./program contains fcntl(0, F_SETPIPE_SZ, 0) this is triggered:
UBSAN: Undefined behaviour in ../include/linux/log2.h:63:13
shift exponent 64 is too large for 64-bit type 'long unsigned int'
CPU: 3 PID: 4978 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
...
Call Trace:
...
 [<ffffffffa18ced53>] ? pipe_fcntl+0xa3/0x7a0
 [<ffffffffa18f1940>] ? SyS_fcntl+0x930/0xf30
 [<ffffffffa2d1fb00>] ? entry_SYSCALL_64_fastpath+0x23/0xc1

Documentaion of roundup_pow_of_two explicitly mentions that passing
size 0 is undefined. So return 0 from round_pipe_size prematurely to
fix this.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
---
 fs/pipe.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs/pipe.c b/fs/pipe.c
index 8e0d9f26dfad..23c0c06ffc33 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -1024,6 +1024,9 @@ static inline unsigned int round_pipe_size(unsigned int size)
 {
 	unsigned long nr_pages;
 
+	if (!size)
+		return 0;
+
 	nr_pages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
 	return roundup_pow_of_two(nr_pages) << PAGE_SHIFT;
 }
-- 
2.10.1