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 441EBC2BC73 for ; Wed, 4 Dec 2019 18:17:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1AB8D206DF for ; Wed, 4 Dec 2019 18:17:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483438; bh=72si8NNBzDHWEy6P8LB/sxnbv3JGkev8Astuf7ElLT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=17XbleYDEKhT+wd/zvW9myp1sFzYfuOYn1KugeQHZ4LVPgX90gq7B9BTVBVo851JJ 9WqGMXY4RTsSIIywwk8TQvqFaSc7F1yOaolvXUHiiyIst0PISHMqO5y4QHead271Ka c59TFE5pd3kp2x+4uMQ9p+djKSoub81SNroGqITw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731577AbfLDSMO (ORCPT ); Wed, 4 Dec 2019 13:12:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:40744 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731566AbfLDSMK (ORCPT ); Wed, 4 Dec 2019 13:12:10 -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 D38F1214AF; Wed, 4 Dec 2019 18:12:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483130; bh=72si8NNBzDHWEy6P8LB/sxnbv3JGkev8Astuf7ElLT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xixNRhSpQEyVu6Tp6ZGGa7Jg4ZQC7XiAn1QvfmjkETTai5El1xuGCbtGCMqTRLVoU q33IwUR6qVRDgg2uG2M0qinMOM8hEjz5wtTmfifskjWSCdC5ysttv617fTh0vsEihu 0tqm1SzFoatU3jtIFu4W8sf1O20ONS2joy/M8SVU= 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.9 037/125] HID: intel-ish-hid: fixes incorrect error handling Date: Wed, 4 Dec 2019 18:55:42 +0100 Message-Id: <20191204175321.235489390@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175308.377746305@linuxfoundation.org> References: <20191204175308.377746305@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 277983aa1d90a..d0b902285fc3a 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