Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp8474897ybi; Tue, 23 Jul 2019 09:12:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqx+cXcwtGC1TOEBIBdD7xQBqlgmgNbSXh+MCq7Qj/zTPvRDNt1/YRZJkrM1RTjVcNHwhEZ9 X-Received: by 2002:a17:902:f216:: with SMTP id gn22mr79480990plb.118.1563898334068; Tue, 23 Jul 2019 09:12:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563898334; cv=none; d=google.com; s=arc-20160816; b=NxLfM9ickyoRQGZVYM3L4xY5OSF657iwd4Ot3/N7qiRcWZh5YK9aCJfyWnCyQvni8f fyaFLFBwpktJ4OOaaFclSu7pRIQiDEyBZtnK3HlwpiduCsYSFStZXK2lB1IG30mURsFd IHKL7koa0jgjvgBPPcSvI7Wa/I+bN7FTF2bdeuaMkllLRfMfwkUHRZMJuY9TCwqzZvEN Wir5w2hWrZQFCrag4kUFJJqM00V9O0XR+s5ZrvQPl+TXKMzu9ijyi/ygqfMraZgJObqc bS6/SofDG/VSJtpkHfOiIbqq+RmzWjDoWwdpcBgA6oP6nzSmn4LQC+Prq6Dkt74tYT8i FFOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:mime-version:user-agent:date:message-id:to:subject :from; bh=K6ggzMv33KAYxSVuPxHOr2uvhyLRYi55KzSZCRZb8TE=; b=kcHO0u16UQJQZxG5OOzq/9y3Cgn4wKcCXYY1UqOCOxQQudP3vTdJalSCxkfhiup3Nt dWys57jQ0wU9Re2r4pVuSztUMQKMWez8XFIQymnr95rcQiMM4Ndc/Rzi8ouxugvdwrMH 3raZlLJm870dZu3ACCB7hJZSRXGsu1XcErkmZDO7H63vMaE9Zw42/oOOyBQW5DTStz7H UwflFrIImYh7fG7Xt8vTjtsMy9SQl9MXdhvawdBCcuR5ovWgQW/fHat09Vyi84363Hh1 msJPBAuyLA4VUIXvcYlLN1rl642kDWzo6PaHYMRDM2IwVvIy9J6VVrhxJqMKymhgx0Ip Q1xw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 130si12911955pgg.18.2019.07.23.09.11.58; Tue, 23 Jul 2019 09:12:14 -0700 (PDT) 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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732340AbfGWGdu (ORCPT + 99 others); Tue, 23 Jul 2019 02:33:50 -0400 Received: from relay.sw.ru ([185.231.240.75]:48394 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730982AbfGWGdu (ORCPT ); Tue, 23 Jul 2019 02:33:50 -0400 Received: from [172.16.24.21] by relay.sw.ru with esmtp (Exim 4.92) (envelope-from ) id 1hpoMs-0005VG-JK; Tue, 23 Jul 2019 09:33:46 +0300 From: Vasily Averin Subject: [PATCH] fuse: BUG_ON's correction in fuse_dev_splice_write() To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Miklos Szeredi , Andrey Ryabinin Message-ID: Date: Tue, 23 Jul 2019 09:33:35 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit 963545357202 ("fuse: reduce allocation size for splice_write") changed size of bufs array, so first BUG_ON should be corrected too. Second BUG_ON become useless, first one also includes the second check: any unsigned nbuf value cannot be less than 0. Fixes: 963545357202 ("fuse: reduce allocation size for splice_write") Signed-off-by: Vasily Averin --- fs/fuse/dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index ea8237513dfa..311c7911271c 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -2064,8 +2064,7 @@ static ssize_t fuse_dev_splice_write(struct pipe_inode_info *pipe, struct pipe_buffer *ibuf; struct pipe_buffer *obuf; - BUG_ON(nbuf >= pipe->buffers); - BUG_ON(!pipe->nrbufs); + BUG_ON(nbuf >= pipe->nrbufs); ibuf = &pipe->bufs[pipe->curbuf]; obuf = &bufs[nbuf]; -- 2.17.1