From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4E9FC43381 for ; Mon, 18 Feb 2019 14:11:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 848CC217D7 for ; Mon, 18 Feb 2019 14:11:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550499060; bh=O1rU7BpPLNofySE0bseJDF+ZOj0NSExWGCgzQt84D1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cqFCkofJoF9pu/snvNjoNWVlv17Ya/yFp74GtR2Kh9hCkM2G/urSSe1/dEi3vQSTS 4zHN9GX1izF2Bqz12MHxmvJi111iVJrLtEHFcX1y4HpLlA0GNz6pHNufLGAShabza2 KnLGDUPefXH4U9TtC2MbLjhYuWHf0AZ2bwZXT1dU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391639AbfBROK7 (ORCPT ); Mon, 18 Feb 2019 09:10:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:54854 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391615AbfBROK5 (ORCPT ); Mon, 18 Feb 2019 09:10:57 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0BEB2217D9; Mon, 18 Feb 2019 14:10:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550499056; bh=O1rU7BpPLNofySE0bseJDF+ZOj0NSExWGCgzQt84D1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=upwbUMGoQbHaZvs37zB/MZIYR1/AD1O18kxcf9bG8sILOfvtlmc6TwbSBlfdkwjYx Lfn8ak5RTM19aL1QxJ/nQ0KpTvf8WthBubrr4DO4qOxM75McKzLzLNiIo4QtaY8ThY 669mye+HBeWJdqFBcz9t/X+Dt9bQlYAZZFGbl1Vg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jann Horn , Miklos Szeredi Subject: [PATCH 3.18 063/108] fuse: call pipe_buf_release() under pipe lock Date: Mon, 18 Feb 2019 14:43:59 +0100 Message-Id: <20190218133522.438627431@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133519.525507231@linuxfoundation.org> References: <20190218133519.525507231@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jann Horn commit 9509941e9c534920ccc4771ae70bd6cbbe79df1c upstream. Some of the pipe_buf_release() handlers seem to assume that the pipe is locked - in particular, anon_pipe_buf_release() accesses pipe->tmp_page without taking any extra locks. From a glance through the callers of pipe_buf_release(), it looks like FUSE is the only one that calls pipe_buf_release() without having the pipe locked. This bug should only lead to a memory leak, nothing terrible. Fixes: dd3bb14f44a6 ("fuse: support splice() writing to fuse device") Cc: stable@vger.kernel.org Signed-off-by: Jann Horn Signed-off-by: Miklos Szeredi Signed-off-by: Greg Kroah-Hartman --- fs/fuse/dev.c | 3 +++ 1 file changed, 3 insertions(+) --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -1971,10 +1971,13 @@ static ssize_t fuse_dev_splice_write(str ret = fuse_dev_do_write(fc, &cs, len); + pipe_lock(pipe); for (idx = 0; idx < nbuf; idx++) { struct pipe_buffer *buf = &bufs[idx]; buf->ops->release(pipe, buf); } + pipe_unlock(pipe); + out: kfree(bufs); return ret;