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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 E060AC2BC73 for ; Wed, 4 Dec 2019 18:03:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A54072073B for ; Wed, 4 Dec 2019 18:03:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482605; bh=9mvyKiStdqWHIi9NvCE4eDL7Uh0tn5Xgra9f21+o9Z4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CwcNBKjYhFK9mC4G0Md9aElZwHq3heoz+/7QhGeb/4xtCFkr8xHV4i+uMmp2ABRpy cqDi5Pbi+0bRylyqlMq9Ny/20vUasS9afueId9gyWtfQysMJ9Qf0fuYKqnP9lh054W AJvDsjBh9ngtQ3V7v9EguiaFR7QxjRNLmA5ad9Mo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730035AbfLDSDY (ORCPT ); Wed, 4 Dec 2019 13:03:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:46894 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730023AbfLDSDT (ORCPT ); Wed, 4 Dec 2019 13:03:19 -0500 Received: from localhost (unknown [217.68.49.72]) (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 F1B912073B; Wed, 4 Dec 2019 18:03:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482599; bh=9mvyKiStdqWHIi9NvCE4eDL7Uh0tn5Xgra9f21+o9Z4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i2BOB00PgoZ3o4J3s7AY4YGFOSZ4JTd7eT/IEYYztFd//SlC2oLWzmrwFT3mWHaa3 UwiflHPVa5d4CsWdDz7SeD6vZOHDYHIsNKcvchZR8HI5TjpiWAVur/+HfdcoTNpwsb JXxx2Esi3j4wClXslUqekYIwCU//9GecA88CfcPo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pan Bian , Benjamin Tissoires , Jiri Kosina , Sasha Levin Subject: [PATCH 4.14 061/209] HID: intel-ish-hid: fixes incorrect error handling Date: Wed, 4 Dec 2019 18:54:33 +0100 Message-Id: <20191204175325.530327484@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@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: Pan Bian [ Upstream commit 6e0856d317440a950b17c00a9283114f025e5699 ] The memory chunk allocated by hid_allocate_device() should be released by hid_destroy_device(), not kfree(). Fixes: 0b28cb4bcb1("HID: intel-ish-hid: ISH HID client driver") Signed-off-by: Pan Bian Reviewed-by: Benjamin Tissoires Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/intel-ish-hid/ishtp-hid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.c b/drivers/hid/intel-ish-hid/ishtp-hid.c index cd23903ddcf19..e918d78e541c0 100644 --- a/drivers/hid/intel-ish-hid/ishtp-hid.c +++ b/drivers/hid/intel-ish-hid/ishtp-hid.c @@ -222,7 +222,7 @@ int ishtp_hid_probe(unsigned int cur_hid_dev, err_hid_device: kfree(hid_data); err_hid_data: - kfree(hid); + hid_destroy_device(hid); return rv; } -- 2.20.1