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.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 2A030C282DD for ; Thu, 23 May 2019 19:12:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EB213217F9 for ; Thu, 23 May 2019 19:12:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638722; bh=IfZLeQWRu8RqRyjidL5ftlvkVob/PoLcjw5qbPzYndg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RXBsO5AOxRMX+IHTwbIENKbM0lw5A71/CD91cVmJra8332wpEbkmDOFAcSgPNNqd7 odBNIjpC2vRlWnvJ9ndpnojXCleg352wXP9ubSAjiNHar807xXJ0v/hL6VWP3aE76J PhodDLflaTzEl8w9f5X3XHE0cafW+HZ1u2h4y/Sg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388342AbfEWTMB (ORCPT ); Thu, 23 May 2019 15:12:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:45574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388313AbfEWTL7 (ORCPT ); Thu, 23 May 2019 15:11:59 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.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 E0DB52186A; Thu, 23 May 2019 19:11:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638718; bh=IfZLeQWRu8RqRyjidL5ftlvkVob/PoLcjw5qbPzYndg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A2Mm24P3PIOiseeAEXtWjC4wmRBa2D6VuylV5u7HbX6RR/njyC/xjGTjBY0ZozU+i 9N9jP3fR90sSlNBj1zUtmZm0q3RLD7NKj4cyhhkzmNdE1J4ZJQdtHEAZ3IdLlaQ0OM Bynwzy58RXRhhFnr8x11BZZk+CqJy37iAoYt4hTQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lars Persson , Ronnie Sahlberg , Pavel Shilovsky , Steve French , Sasha Levin Subject: [PATCH 4.14 22/77] Revert "cifs: fix memory leak in SMB2_read" Date: Thu, 23 May 2019 21:05:40 +0200 Message-Id: <20190523181723.408443846@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181719.982121681@linuxfoundation.org> References: <20190523181719.982121681@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Greg Kroah-Hartman This reverts commit c54a881d793e3eea2a1b1460c5778b22128821ea which is commit 05fd5c2c61732152a6bddc318aae62d7e436629b upstream. Lars writes: This patch should not be in 4.14-stable because 088aaf17aa79300cab14dbee2569c58cfafd7d6e was for 4.18+. Now we have a double-free crash in SMB2_read because there are 2 calls to cifs_small_buf_release in the error path. It was a mistake to backport it this far, so let's revert it. Reported-by: Lars Persson Cc: Ronnie Sahlberg Cc: Pavel Shilovsky Cc: Steve French Cc: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2pdu.c | 1 - 1 file changed, 1 deletion(-) --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2699,7 +2699,6 @@ SMB2_read(const unsigned int xid, struct cifs_dbg(VFS, "Send error in read = %d\n", rc); } free_rsp_buf(resp_buftype, rsp_iov.iov_base); - cifs_small_buf_release(req); return rc == -ENODATA ? 0 : rc; }