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 896EEC433FF for ; Wed, 14 Aug 2019 02:19:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5432D208C2 for ; Wed, 14 Aug 2019 02:19:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749170; bh=RJiXeKfS42makB4C4taAZV1n6o5Ln+7nifGi48PCrng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pMXnNX53FPWA9hiyNn/CRsH7knZ24DxkTWBXQEKb0v7CuHlAql4hDkodhyy4tMdQH mwzCP5J7aN/9q7iZQ+nzoCSl7oEj6RmoBfGQ2cdBbzdJY3ZdypJZrO+eNLex5I+KQO Dc/7vmry9ca9okEntaGc+rXAIIc9f3PekXVyr7YU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729741AbfHNCT3 (ORCPT ); Tue, 13 Aug 2019 22:19:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:50308 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729704AbfHNCTZ (ORCPT ); Tue, 13 Aug 2019 22:19:25 -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 9DECA208C2; Wed, 14 Aug 2019 02:19:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565749164; bh=RJiXeKfS42makB4C4taAZV1n6o5Ln+7nifGi48PCrng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qeaiBND9RwYTX5YijTfnFY71rjXtNQd6CakS0bhyQul0X6RlmGh/Oy/jz/7NVksM7 zzjlXCPEw5rTeKOggDYjaW40Q1MIX96ikaiMI9XL0WxOHcq1cEiZ0mwesSB9KMahpX QRQ+gTNmScBeylU7Bc5eIKHdFPndh3ANv8i+iNLo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hillf Danton , syzbot , Andrey Konovalov , Jiri Kosina , Sasha Levin , linux-usb@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 31/44] HID: hiddev: do cleanup in failure of opening a device Date: Tue, 13 Aug 2019 22:18:20 -0400 Message-Id: <20190814021834.16662-31-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190814021834.16662-1-sashal@kernel.org> References: <20190814021834.16662-1-sashal@kernel.org> MIME-Version: 1.0 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 [ Upstream commit 6d4472d7bec39917b54e4e80245784ea5d60ce49 ] 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: Sasha Levin --- 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 5e1361dfb61cd..ce342fd0457e9 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -321,6 +321,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