Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp3064215ybt; Mon, 29 Jun 2020 14:19:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxis5Zpyeu6VeXI/Wq8S4VRs9FOWMkkzlPNqe1qsoAbAkl8cl9LKsK12dI3E0ljFEMQA8rS X-Received: by 2002:a17:906:398f:: with SMTP id h15mr8304260eje.391.1593465581847; Mon, 29 Jun 2020 14:19:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593465581; cv=none; d=google.com; s=arc-20160816; b=MtyvTIutfOsRBXyEEUznQ3RZr1YCDI4wf++YZNqeItUCHIw1SFPXI9dJn4+MFHPSs+ xj/OZZhN+cN5T4g6IEN/dMCf5wFRDPphuvHw+of9xGBGVRmZnyzk23uZRNofmIN8d0mu R7T01Kjht1Nd9ykspQCjwls44ULmwqWEHsXCVNnYOnb4bPMe47YpWxrJIJk0o8pkEldM 2Uik/IS1zuhm0cz6HS5K6sVoOnGXcQv3/7R29PQ4JWmOqrbGQF68BWzwOLfhe9sJgUZE lm0U0KeCm8T8xNKSaaDrzTALzwXiVpLFIKOZPuRPIlsLh0HHIuM3CAfbAdQ5eh85jffN 4U1w== 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:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cciQlZt4Bb6ZJ5M2XZOiDZR2fblCi6w/sRJ7eOJpks8=; b=izPTICbKLEQvgn4Mv9XDvDecwXaUefIHB4uAQ6zPOzqYMdw7P83OPENOz6JO9hbhVf jKaWKiGDonct5BjYtJllt7NrAe0S+zKFyK6BzeGD9miDuDzWVmvMEOv5TpEt0WC9Uo6+ 9fWZTY1pSfyG0yrAdScjZpW/r7Ux6eBCuwRTo5+Daa74UsGaBrP52l0ydu9DtMlqc8N8 OXv5U6brGoteIe37969aNPpYqrUZJ246PVW6xAkXcaRTn60OMwWSWV3ZqNNsNwNcq4K5 q7KFriTqix8/eOWkJ/ZQSUIf1jKXIdyf1yv3En28IF/ISTOrJUoXjLyAaJ16v2rOU8KC CXQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kj1c03mM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w14si469650ede.41.2020.06.29.14.19.18; Mon, 29 Jun 2020 14:19:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=kj1c03mM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390686AbgF2VQC (ORCPT + 99 others); Mon, 29 Jun 2020 17:16:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:42436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729947AbgF2SzP (ORCPT ); Mon, 29 Jun 2020 14:55:15 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 680B225554; Mon, 29 Jun 2020 15:55:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593446121; bh=UQu+7V1cXILSqWmsj5TqeEtkMiRO+mIQRZp8rW3iTS8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kj1c03mM85vLRRTV/wqBIERNgmVF5l2DHJPoETr7ldr0k8birB0omqyWwOpbKWGpS QurUX/qVs0l678aZzrbtfr40VZFAw9rFPxJDFTUJa+ayEQsjRJ5GQzP0cGSGyPXMDC q/ZIXcfrprkLKMuR23lW/TgVxg8Mgv9kg5Wgxm8g= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fan Guo , Jason Gunthorpe , Sasha Levin Subject: [PATCH 4.4 112/135] RDMA/mad: Fix possible memory leak in ib_mad_post_receive_mads() Date: Mon, 29 Jun 2020 11:52:46 -0400 Message-Id: <20200629155309.2495516-113-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200629155309.2495516-1-sashal@kernel.org> References: <20200629155309.2495516-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.4.229-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.4.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.4.229-rc1 X-KernelTest-Deadline: 2020-07-01T15:53+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fan Guo [ Upstream commit a17f4bed811c60712d8131883cdba11a105d0161 ] If ib_dma_mapping_error() returns non-zero value, ib_mad_post_receive_mads() will jump out of loops and return -ENOMEM without freeing mad_priv. Fix this memory-leak problem by freeing mad_priv in this case. Fixes: 2c34e68f4261 ("IB/mad: Check and handle potential DMA mapping errors") Link: https://lore.kernel.org/r/20200612063824.180611-1-guofan5@huawei.com Signed-off-by: Fan Guo Signed-off-by: Jason Gunthorpe Signed-off-by: Sasha Levin --- drivers/infiniband/core/mad.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index 616173b7a5e8a..c26fdcb7dddf8 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c @@ -2912,6 +2912,7 @@ static int ib_mad_post_receive_mads(struct ib_mad_qp_info *qp_info, DMA_FROM_DEVICE); if (unlikely(ib_dma_mapping_error(qp_info->port_priv->device, sg_list.addr))) { + kfree(mad_priv); ret = -ENOMEM; break; } -- 2.25.1