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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 4DF3CC3A5A1 for ; Thu, 22 Aug 2019 17:26:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17F832064A for ; Thu, 22 Aug 2019 17:26:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494807; bh=RwIlGsY5UpAFUdjUsjZdVdMjzCqIzdQG2xcWQDnjdI8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=n71ZbNIn2N4DNeGWNfVBixckHUhKyzYSkzJRHdLuYx5uuxy4VmlYpyruxFnbgzIxg dsvubwoN2bH/iY7Ci/pVjphBEcQ6RW9EqXVdS+8uTqmszY9vKHkvokDBrOTcOYXuMr O4JO7oYVTbzYSt4xeMBt8QTvU4xke8KaWx2McK08= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391914AbfHVR0p (ORCPT ); Thu, 22 Aug 2019 13:26:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:49182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404445AbfHVRZa (ORCPT ); Thu, 22 Aug 2019 13:25:30 -0400 Received: from localhost (wsip-184-188-36-2.sd.sd.cox.net [184.188.36.2]) (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 17B3423400; Thu, 22 Aug 2019 17:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494730; bh=RwIlGsY5UpAFUdjUsjZdVdMjzCqIzdQG2xcWQDnjdI8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2U0QtRAzHnyEUPh+Z7G+bgy38xXKmLQiKmjPAg/j/pOgwT9Ih8csq/1xdFkZIDroe ngbiTaF20u1rkR8V2IAIb9qAiBGEmHMvSqxz2EO15iTwQDq6l/r0dplgE7Ytv9VWRw ClaIbluVmncLTlYs+WLDrC8b95UbPwOA/kRa4Aa0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot , Andrey Konovalov , Hillf Danton , Jiri Kosina Subject: [PATCH 4.19 20/85] HID: hiddev: do cleanup in failure of opening a device Date: Thu, 22 Aug 2019 10:18:53 -0700 Message-Id: <20190822171732.018807591@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822171731.012687054@linuxfoundation.org> References: <20190822171731.012687054@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: 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(+) --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c @@ -321,6 +321,10 @@ bail_normal_power: 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);