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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 A205EC3A5A1 for ; Thu, 22 Aug 2019 17:17:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6AFC82089E for ; Thu, 22 Aug 2019 17:17:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494239; bh=lW+S8uKOzb511hV9dfHs1XB5RiJuMW7x/XjDJETPOro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Hzpb0U59anQwNdDZiKxkpaUVf26ra1Bzur9wXd5/xvS9jbaL/MqT9Hw3LwNgbr801 yl9FkCFMGUYGA/7pgaENlMtTAtlZ1mH5/LWI8l4D/SIJByJaD0qiWfHvu50wsJCeUW uaJMuc5UpL8OwtjLInCZ3NpHyXAMKob4O/kbFiAI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391282AbfHVRRS (ORCPT ); Thu, 22 Aug 2019 13:17:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:58028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390293AbfHVRI3 (ORCPT ); Thu, 22 Aug 2019 13:08:29 -0400 Received: from sasha-vm.mshome.net (wsip-184-188-36-2.sd.sd.cox.net [184.188.36.2]) (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 4718F23406; Thu, 22 Aug 2019 17:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566493708; bh=lW+S8uKOzb511hV9dfHs1XB5RiJuMW7x/XjDJETPOro=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nyViDbh4PNp7cyePklYTSQ52IdPlYD+vD2W3EWpTDQCHdXJcpxUAdfeik9aQwimsv WAX1zXcjYjLV2hVffmLsQVkHUd3+eES/A+kRCWUIG71DdhTMqhMOYb0LhVrON+AXe9 dJvjk59mhmPcu5/sMG6bNzlgheMPSFbR6RTS2wAE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hillf Danton , syzbot , Andrey Konovalov , Jiri Kosina , Greg Kroah-Hartman Subject: [PATCH 5.2 026/135] HID: hiddev: do cleanup in failure of opening a device Date: Thu, 22 Aug 2019 13:06:22 -0400 Message-Id: <20190822170811.13303-27-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190822170811.13303-1-sashal@kernel.org> References: <20190822170811.13303-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.2.10-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-5.2.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 5.2.10-rc1 X-KernelTest-Deadline: 2019-08-24T17:07+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: Hillf Danton commit 6d4472d7bec39917b54e4e80245784ea5d60ce49 upstream. Undo what we did for opening before releasing the memory slice. Reported-by: syzbot Cc: Andrey Konovalov Signed-off-by: Hillf Danton Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- drivers/hid/usbhid/hiddev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index c07df82923802..4e11cc6fc34bc 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -308,6 +308,10 @@ static int hiddev_open(struct inode *inode, struct file *file) hid_hw_power(hid, PM_HINT_NORMAL); bail_unlock: mutex_unlock(&hiddev->existancelock); + + spin_lock_irq(&list->hiddev->list_lock); + list_del(&list->node); + spin_unlock_irq(&list->hiddev->list_lock); bail: file->private_data = NULL; vfree(list); -- 2.20.1