Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp102778ybl; Tue, 10 Dec 2019 18:35:03 -0800 (PST) X-Google-Smtp-Source: APXvYqx1X+KHn8vE0kD2oIBnmhRFKqCUG6Csi7BJpSsbIInqHqT+4GyYQBUOvQZrymzq+ZsaZS5E X-Received: by 2002:a54:4781:: with SMTP id o1mr934642oic.117.1576031703185; Tue, 10 Dec 2019 18:35:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576031703; cv=none; d=google.com; s=arc-20160816; b=k5B40JvL4k0kinQr4OBnq9WsXuCioKhCRNBAH4NqDXdZLSnaZAZ6XUDm/3ifSECCSx 4PHZHnKXrABuViEGxYNotqCzK6rgIzpFJ/jXJtBHBtQhqV9yRR/35a5gx36//33jjA6x 4m58i869yg8yVFMVKmHJ+xluZhRtVtJqwqTL94gnBE+YdQlbz/S0051Ak2hOZvMAQ/st fTAXL4InsUOni9cy2vIhvzDfoVbih8fFxNeGtpfSP3REHe5u32zuztCYtjzsQajUgnwN 7bhe0IeQIAMf4s4BNbrrlRPktShYpSWwrE6/Ga5CVcMESWFDGYOzEKb2/9XPiRMYYaN4 W2xA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=iEKzTuCqR7pNiiQwEPYEy8kcmr1QVizqhrNITFAc66g=; b=iFlAJgStExIyd/jDyUJcNwr1/VPyu0EzVSyoQdL7hAJwssMX/A1r/obye37mHR6OdV rVZNRUB+6m3M9QLOoPp73xA72Z0E1dpODJByea31QDxfH/qp+7YPck1+XFx4H2BwB9T0 Tkbs6OTtxB1o+JjM3oIljF+BORmtHl12U66PcaraFQI+iGxoDmtsvpF/+TND4qP5w6lP UuxPTPcjdT37ZBZpIWNmy2+pJSWAuAXdE19LsTzArfsl7vcP/6dcRnPzsxe/SBq22v6R +O30NDZpcdDLgv3JXW7i1lrtcBiVL89ry4E+vXp6PLqoiHbohhZDKo0MSwnRzQrN75A4 fszg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jhitx4aR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w131si311698oie.47.2019.12.10.18.34.50; Tue, 10 Dec 2019 18:35:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=jhitx4aR; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727663AbfLKCeC (ORCPT + 99 others); Tue, 10 Dec 2019 21:34:02 -0500 Received: from mail-il1-f194.google.com ([209.85.166.194]:35816 "EHLO mail-il1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727561AbfLKCeC (ORCPT ); Tue, 10 Dec 2019 21:34:02 -0500 Received: by mail-il1-f194.google.com with SMTP id g12so18083395ild.2 for ; Tue, 10 Dec 2019 18:34:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=iEKzTuCqR7pNiiQwEPYEy8kcmr1QVizqhrNITFAc66g=; b=jhitx4aRBOOz+jmv2AdxMTyqInT1bcrJpJQrh2AujwgKjCk7x80bT0oiDqPkvTISqQ VrBBCyTpvQeSo7dTn6TGKeeBekh7krkbUT/+1rwJp9fjTg+daD1Tb3jNrZkOGzm1D4on Man28nmAuAeeDJtWUMKkJx51s8TauUwWxFLrICSSBE316NILVKWpSYlYOoVIO9PDmnFb ABJtdiBmhEFMvhz+N3VZGM5xiWp2fzeZWIjYuaiaX9IT3cO+Y4395HQCyHACRXdyKj6E 4b880AaNKmyxDxQzOyorITa2vuUTbVvAkAbshJ0KRN2p6Ur37qO/k9+WLCF8EM3c/TWG n7fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=iEKzTuCqR7pNiiQwEPYEy8kcmr1QVizqhrNITFAc66g=; b=pZU9j0t0qJvze8iVSA72uTHnCXdUvsx2m/0IUzI8/+AD37cLGmA23RRUZJ4/RbtKWW 7OfNo/LxwMBy0qBItq7AFftuCTiMkbwwGPQcuRyJ0GFSW1k92EF4KHQN6zqdHtqtCISM E8fBY8nZx5MuvmYKAHss7JzPUP+duRRHPvn4GkPj7TfBLWJ5mqZZltqOg/PjlHlZljsC BBEjEVA4nkh/7bXMbYCzQnAIlZYVkTlGP2yPFb4osJqwOi+6rlHst4H35CEhjavIELKO 9PsD6ZpUsemy3cxfIbnGmNlk+2+MzIvA/VTNONvZ7f9keJFdfnmzGUSKlLI1jTTlxaHk oY2w== X-Gm-Message-State: APjAAAVVoRnUb+aNN1ujzRrZGNQh5M7vMHQxB1jLh+10nFRsJblh3HfN uC47XHrbU/YLwnHhT20XNH4QxQzwuuHSuM4Fv08= X-Received: by 2002:a92:8d4e:: with SMTP id s75mr885642ild.172.1576031641683; Tue, 10 Dec 2019 18:34:01 -0800 (PST) MIME-Version: 1.0 References: <20190925043800.726-1-navid.emamdoost@gmail.com> In-Reply-To: From: Navid Emamdoost Date: Tue, 10 Dec 2019 20:33:50 -0600 Message-ID: Subject: Re: [PATCH] drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add To: VMware Graphics , Thomas Hellstrom , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org Cc: Navid Emamdoost , LKML Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ping ... On Thu, Nov 21, 2019 at 12:17 PM Navid Emamdoost wrote: > > On Tue, Sep 24, 2019 at 11:38 PM Navid Emamdoost > wrote: > > > > In vmw_cmdbuf_res_add if drm_ht_insert_item fails the allocated memory > > for cres should be released. > > > > Signed-off-by: Navid Emamdoost > > Would you please review this patch? > > Thanks, > > > --- > > drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > > index 4ac55fc2bf97..44d858ce4ce7 100644 > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > > @@ -209,8 +209,10 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man, > > > > cres->hash.key = user_key | (res_type << 24); > > ret = drm_ht_insert_item(&man->resources, &cres->hash); > > - if (unlikely(ret != 0)) > > + if (unlikely(ret != 0)) { > > + kfree(cres); > > goto out_invalid_key; > > + } > > > > cres->state = VMW_CMDBUF_RES_ADD; > > cres->res = vmw_resource_reference(res); > > -- > > 2.17.1 > > > > > -- > Navid. -- Navid.