Message ID | 20180127004759.101823-1-ebiggers3@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-block-owner@kernel.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5E8AF60383 for <patchwork-linux-block@patchwork.kernel.org>; Sat, 27 Jan 2018 00:49:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F2342A416 for <patchwork-linux-block@patchwork.kernel.org>; Sat, 27 Jan 2018 00:49:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 311A92A4AC; Sat, 27 Jan 2018 00:49:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8D9C2A416 for <patchwork-linux-block@patchwork.kernel.org>; Sat, 27 Jan 2018 00:49:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751940AbeA0AtS (ORCPT <rfc822;patchwork-linux-block@patchwork.kernel.org>); Fri, 26 Jan 2018 19:49:18 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:40483 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889AbeA0AtR (ORCPT <rfc822;linux-block@vger.kernel.org>); Fri, 26 Jan 2018 19:49:17 -0500 Received: by mail-it0-f65.google.com with SMTP id 196so3615569iti.5; Fri, 26 Jan 2018 16:49:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1Wx9coXe5SdBvb8mC/R4ob4UW+rpaEK46MAuKMEHtrw=; b=DIraLAguFeTBSVYyW1Ets+TlxgxcuKJroGpJHfqIQALzyJs4QTNPZc38CiCiZbQhh3 MDi2LssZs2/qOrRT//RQelutgmSlc8HIfPfoKgkAye0dvpmtNgdHutCNHWE0C78zMAmq xC5BXj358BDQD2l+lHA+9E9X7b1qidT5ABTRJ6ha7rGewq3esnwFK0ocy01z3zQvNS8v FUiTGElSTDQ70jJ36lW9aXAXyHsieMes09p848kklkSRc+zh/oyqBdf7CemXHV0Tg0Jb CRP/wlpXRInK7QvTm/8njVCgzT0K7C9Q12jrbVx6zi1+OGPtS7ANPCXhmN+cfl/olAt/ sYxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1Wx9coXe5SdBvb8mC/R4ob4UW+rpaEK46MAuKMEHtrw=; b=mtjrhGLrrxjsOPJUptJbFlxnd1zeHJTyiUCJ1M9OogX1zr1u1MWA9PpdmtepI0TqJx C57Zrwj/o7RnpH7JhVx6GH80XlyD+ikdRmT8JFR8/cOKbeudjQyFIslBZgNky88GyzT8 wmiwP8CRCb5vaOn35yE1yuAiKalPSBLximl45/TkDoa2E6t5joTIb1udqta5ulE3ZN2d +20IjYr3KLDoDZAGS1bCk7/25lUUmQEKKhQbz66/7O0bsEiVmWnrjcfKTCZOMVrLMvZV q4ewQLdgPlGqCP37Bx+lo39RfkdAAiFMN6t6OXHYxxovXvyIpt9EmSWPZwuWl/Qa99tD 1S0A== X-Gm-Message-State: AKwxytfmMgaPrtpj+WkZ6x/VOMLMaNmhlSpkSKIGaAXoInXmJF5AdFlo RRTJPIKKQ2uFcvRjcz4fpfCJM1tDSyc= X-Google-Smtp-Source: AH8x227LHkENzZ6M1D/WGC8mlmIgB09Pi43p9lLQ4P5VuzQF3w/vn/XjZV1kix82prYcrWgeBsVLuA== X-Received: by 10.36.190.76 with SMTP id i73mr19790409itf.88.1517014156095; Fri, 26 Jan 2018 16:49:16 -0800 (PST) Received: from ebiggers-linuxstation.kir.corp.google.com ([2620:15c:17:3:dc28:5c82:b905:e8a8]) by smtp.gmail.com with ESMTPSA id k5sm1184049ioe.59.2018.01.26.16.49.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 26 Jan 2018 16:49:15 -0800 (PST) From: Eric Biggers <ebiggers3@gmail.com> To: linux-kernel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org> Cc: Zhouyi Zhou <yizhouzhou@ict.ac.cn>, Jens Axboe <axboe@kernel.dk>, linux-block@vger.kernel.org, syzkaller-bugs@googlegroups.com, Eric Biggers <ebiggers@google.com>, stable@vger.kernel.org Subject: [PATCH] Revert "kernel/relay.c: fix potential memory leak" Date: Fri, 26 Jan 2018 16:47:59 -0800 Message-Id: <20180127004759.101823-1-ebiggers3@gmail.com> X-Mailer: git-send-email 2.16.0.rc1.238.g530d649a79-goog In-Reply-To: <089e082d01d08b36a6055cd763ca@google.com> References: <089e082d01d08b36a6055cd763ca@google.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: <linux-block.vger.kernel.org> X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/kernel/relay.c b/kernel/relay.c index 39a9dfc69486..55da824f4adc 100644 --- a/kernel/relay.c +++ b/kernel/relay.c @@ -611,7 +611,6 @@ struct rchan *relay_open(const char *base_filename, kref_put(&chan->kref, relay_destroy_channel); mutex_unlock(&relay_channels_mutex); - kfree(chan); return NULL; } EXPORT_SYMBOL_GPL(relay_open);