From patchwork Thu Oct 1 00:58:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11810647 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B0F8A92C for ; Thu, 1 Oct 2020 00:58:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 93F7621531 for ; Thu, 1 Oct 2020 00:58:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="esrxau4d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732322AbgJAA63 (ORCPT ); Wed, 30 Sep 2020 20:58:29 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:20870 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732253AbgJAA62 (ORCPT ); Wed, 30 Sep 2020 20:58:28 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601513907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6/nUF3ElHb92nC9jUNM3d81i3q6Balac69D72MKGCa4=; b=esrxau4dxL8ND7zeLlePLKXO4njP2VAexexrzju/+D1CZraLby2vBsZEpIEUYumVW5WKqo 0SA/SzjnCHTy5NiZlFuP7yfxw8Z6bPvIjzH7QQP5+vTCHSiJImvCtE7J8t18pcn6pGK6VO RIsVSgtltW1LhfBxOxPQ9sAL+voVij4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-342-SwV6iesROOWnE9tmOJEqAw-1; Wed, 30 Sep 2020 20:58:22 -0400 X-MC-Unique: SwV6iesROOWnE9tmOJEqAw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C7797186DD22; Thu, 1 Oct 2020 00:58:21 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-115-71.rdu2.redhat.com [10.10.115.71]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D09973678; Thu, 1 Oct 2020 00:58:21 +0000 (UTC) From: Qian Cai To: David Howells , Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] pipe: Fix memory leaks in create_pipe_files() Date: Wed, 30 Sep 2020 20:58:04 -0400 Message-Id: <20201001005804.25641-1-cai@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Calling pipe2() with O_NOTIFICATION_PIPE could results in memory leaks in an error path or CONFIG_WATCH_QUEUE=n. Plug them. unreferenced object 0xc00000141114a0d8 (size 992): comm "trinity-c61", pid 1353192, jiffies 4296255779 (age 25989.560s) hex dump (first 32 bytes): 80 11 00 00 e8 03 00 00 00 00 00 00 00 00 00 00 ................ ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................ backtrace: [<00000000abff13d7>] kmem_cache_alloc+0x1b4/0x470 [<000000009502e5d5>] alloc_inode+0xd0/0x130 [<00000000ca1c1a21>] new_inode_pseudo+0x1c/0x80 new_inode_pseudo at fs/inode.c:932 [<000000000c01d1d6>] create_pipe_files+0x48/0x2d0 get_pipe_inode at fs/pipe.c:874 (inlined by) create_pipe_files at fs/pipe.c:914 [<00000000d13ff4c4>] __do_pipe_flags+0x50/0x120 __do_pipe_flags at fs/pipe.c:965 [<0000000003941e42>] do_pipe2+0x3c/0x100 do_pipe2 at fs/pipe.c:1013 [<00000000a006b818>] sys_pipe2+0x1c/0x30 __se_sys_pipe2 at fs/pipe.c:1028 [<00000000a6925b55>] system_call_exception+0xf8/0x1d0 [<000000001c6b0740>] system_call_common+0xe8/0x218 unreferenced object 0xc000001f575ce600 (size 512): comm "trinity-c61", pid 1353192, jiffies 4296255779 (age 25989.560s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 ad 4e ad de .............N.. ff ff ff ff 00 00 00 00 ff ff ff ff ff ff ff ff ................ backtrace: [<00000000d74d5e3a>] kmem_cache_alloc_trace+0x1c4/0x2d0 [<0000000061cbc9cb>] alloc_pipe_info+0x88/0x2c0 kmalloc at include/linux/slab.h:554 (inlined by) kzalloc at include/linux/slab.h:666 (inlined by) alloc_pipe_info at fs/pipe.c:793 [<00000000efd6129c>] create_pipe_files+0x6c/0x2d0 get_pipe_inode at fs/pipe.c:883 (inlined by) create_pipe_files at fs/pipe.c:914 [<00000000d13ff4c4>] __do_pipe_flags+0x50/0x120 [<0000000003941e42>] do_pipe2+0x3c/0x100 [<00000000a006b818>] sys_pipe2+0x1c/0x30 [<00000000a6925b55>] system_call_exception+0xf8/0x1d0 [<000000001c6b0740>] system_call_common+0xe8/0x218 unreferenced object 0xc000000d94f20400 (size 1024): comm "trinity-c61", pid 1353192, jiffies 4296255779 (age 25989.560s) hex dump (first 32 bytes): 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<00000000e60ee00f>] __kmalloc+0x1e4/0x330 [<00000000130e8cc8>] alloc_pipe_info+0x154/0x2c0 kmalloc_array at include/linux/slab.h:594 (inlined by) kcalloc at include/linux/slab.h:605 (inlined by) alloc_pipe_info at fs/pipe.c:810 [<00000000efd6129c>] create_pipe_files+0x6c/0x2d0 [<00000000d13ff4c4>] __do_pipe_flags+0x50/0x120 [<0000000003941e42>] do_pipe2+0x3c/0x100 [<00000000a006b818>] sys_pipe2+0x1c/0x30 [<00000000a6925b55>] system_call_exception+0xf8/0x1d0 [<000000001c6b0740>] system_call_common+0xe8/0x218 Fixes: c73be61cede5 ("pipe: Add general notification queue support") Signed-off-by: Qian Cai --- fs/pipe.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/pipe.c b/fs/pipe.c index 60dbee457143..5184972cd9c0 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -920,10 +920,13 @@ int create_pipe_files(struct file **res, int flags) if (flags & O_NOTIFICATION_PIPE) { #ifdef CONFIG_WATCH_QUEUE if (watch_queue_init(inode->i_pipe) < 0) { + free_pipe_info(inode->i_pipe); iput(inode); return -ENOMEM; } #else + free_pipe_info(inode->i_pipe); + iput(inode); return -ENOPKG; #endif }