From patchwork Thu Aug 24 06:14:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Rameshbabu X-Patchwork-Id: 717054 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E19BC71153 for ; Thu, 24 Aug 2023 06:15:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240013AbjHXGPA (ORCPT ); Thu, 24 Aug 2023 02:15:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240014AbjHXGOb (ORCPT ); Thu, 24 Aug 2023 02:14:31 -0400 Received: from mail-0301.mail-europe.com (mail-0301.mail-europe.com [188.165.51.139]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85FE310F9 for ; Wed, 23 Aug 2023 23:14:29 -0700 (PDT) Date: Thu, 24 Aug 2023 06:14:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1692857665; x=1693116865; bh=4XKRv0EyMFF/Fs9/hSrqMLH5iIDEpHodNHfvMuf+WWU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=ujsTgwn4V1eKEVZx94ngRjgFS+ASPqgEHkMZ6NvNCDcyqLbVBpDLB8vq6DJlhJ4lM dzsuWjPF89dnv/iYn6R1a+YcFO682NQb4PHwH/98rYULbtkO/YjooXNWDI5pwMQi8e kLoXgNXwed2zs98x/tEhhGK3UoxqlKEhulPqMrYEEeCsQMNhkaFqkQm3EqgPxiW3N+ /HR6XDRm8qVHmhtQ5K+IU2mmo4Vn+qdcq4InQzr0C7TMMsMyMx243zBPnNrwXabLrV qqIUM3HNzeY8fpVR2/L3UKHjsgA2Lz7scs5nT9/pt6f2SG1SGVk7S58/x4nJuCS9Nd ZZpu3WNVeqK5Q== To: linux-input@vger.kernel.org From: Rahul Rameshbabu Cc: Benjamin Tissoires , Jiri Kosina , Dmitry Torokhov , Maxime Ripard , Rahul Rameshbabu , syzbot+3a0ebe8a52b89c63739d@syzkaller.appspotmail.com Subject: [PATCH HID 1/3] HID: uclogic: Correct devm device reference for hidinput input_dev name Message-ID: <20230824061308.222021-2-sergeantsagara@protonmail.com> In-Reply-To: <20230824061308.222021-1-sergeantsagara@protonmail.com> References: <20230824061308.222021-1-sergeantsagara@protonmail.com> Feedback-ID: 26003777:user:proton MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Reference the HID device rather than the input device for the devm allocation of the input_dev name. Referencing the input_dev would lead to a use-after-free when the input_dev was unregistered and subsequently fires a uevent that depends on the name. At the point of firing the uevent, the name would be freed by devres management. Use devm_kasprintf to simplify the logic for allocating memory and formatting the input_dev name string. Reported-by: syzbot+3a0ebe8a52b89c63739d@syzkaller.appspotmail.com Closes: https://lore.kernel.org/linux-input/ZOZIZCND+L0P1wJc@penguin/T/ Reported-by: Maxime Ripard Closes: https://lore.kernel.org/linux-input/ZOZIZCND+L0P1wJc@penguin/T/#m443f3dce92520f74b6cf6ffa8653f9c92643d4ae Fixes: cce2dbdf258e ("HID: uclogic: name the input nodes based on their tool") Suggested-by: Maxime Ripard Suggested-by: Dmitry Torokhov Signed-off-by: Rahul Rameshbabu --- drivers/hid/hid-uclogic-core.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c index f67835f9ed4c..ad74cbc9a0aa 100644 --- a/drivers/hid/hid-uclogic-core.c +++ b/drivers/hid/hid-uclogic-core.c @@ -85,10 +85,8 @@ static int uclogic_input_configured(struct hid_device *hdev, { struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev); struct uclogic_params *params = &drvdata->params; - char *name; const char *suffix = NULL; struct hid_field *field; - size_t len; size_t i; const struct uclogic_params_frame *frame; @@ -146,14 +144,9 @@ static int uclogic_input_configured(struct hid_device *hdev, } } - if (suffix) { - len = strlen(hdev->name) + 2 + strlen(suffix); - name = devm_kzalloc(&hi->input->dev, len, GFP_KERNEL); - if (name) { - snprintf(name, len, "%s %s", hdev->name, suffix); - hi->input->name = name; - } - } + if (suffix) + hi->input->name = devm_kasprintf(&hdev->dev, GFP_KERNEL, + "%s %s", hdev->name, suffix); return 0; } From patchwork Thu Aug 24 06:14:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Rameshbabu X-Patchwork-Id: 716693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39947C27C40 for ; Thu, 24 Aug 2023 06:15:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240014AbjHXGPA (ORCPT ); Thu, 24 Aug 2023 02:15:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240085AbjHXGOt (ORCPT ); Thu, 24 Aug 2023 02:14:49 -0400 Received: from mail-0201.mail-europe.com (mail-0201.mail-europe.com [51.77.79.158]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A44F81725 for ; Wed, 23 Aug 2023 23:14:40 -0700 (PDT) Date: Thu, 24 Aug 2023 06:14:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1692857677; x=1693116877; bh=mJOsIarCJFq1yZ+dQYTuCbLEkIrOjjJIo4ByKQ8V7j4=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=PYh0MvXBfhX0pqBFJ4kH1XopDp6XDVko6KlRXpcUWFVeYcOW+YCqzNuq2gdzyWDM1 HsCaNiSjhOYQr1pl+gDKQo2VhTbDA8if6QlfRMqbsWYIxcOie2JFEM9IbjDR/qltag sBicuplKjlny+tYRuLKSoYtaUl6GCzPAQCF7rz5FKiHywACw0SB5MqwV1UxTAk2rjs hnQyMPyTqMykK48KnXz563NIwSjvGBAN7rd/z5vPhCaw+MGODiV92iUOIEJULPvEGg tvWdBngI3TX+jPWIQlTo/AOSSdjQaPHKLlMSObueWzP5wnuc0WrAPP2HvGyO8laU4H KEx3+hQ7F1VOA== To: linux-input@vger.kernel.org From: Rahul Rameshbabu Cc: Benjamin Tissoires , Jiri Kosina , Dmitry Torokhov , Maxime Ripard , Rahul Rameshbabu Subject: [PATCH HID 2/3] HID: multitouch: Correct devm device reference for hidinput input_dev name Message-ID: <20230824061308.222021-3-sergeantsagara@protonmail.com> In-Reply-To: <20230824061308.222021-1-sergeantsagara@protonmail.com> References: <20230824061308.222021-1-sergeantsagara@protonmail.com> Feedback-ID: 26003777:user:proton MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Reference the HID device rather than the input device for the devm allocation of the input_dev name. Referencing the input_dev would lead to a use-after-free when the input_dev was unregistered and subsequently fires a uevent that depends on the name. At the point of firing the uevent, the name would be freed by devres management. Use devm_kasprintf to simplify the logic for allocating memory and formatting the input_dev name string. Reported-by: Maxime Ripard Closes: https://lore.kernel.org/linux-input/ZOZIZCND+L0P1wJc@penguin/T/#m443f3dce92520f74b6cf6ffa8653f9c92643d4ae Fixes: c08d46aa805b ("HID: multitouch: devm conversion") Suggested-by: Maxime Ripard Suggested-by: Dmitry Torokhov Signed-off-by: Rahul Rameshbabu --- drivers/hid/hid-multitouch.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index e31be0cb8b85..521b2ffb4244 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -1594,7 +1594,6 @@ static void mt_post_parse(struct mt_device *td, struct mt_application *app) static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi) { struct mt_device *td = hid_get_drvdata(hdev); - char *name; const char *suffix = NULL; struct mt_report_data *rdata; struct mt_application *mt_application = NULL; @@ -1645,15 +1644,9 @@ static int mt_input_configured(struct hid_device *hdev, struct hid_input *hi) break; } - if (suffix) { - name = devm_kzalloc(&hi->input->dev, - strlen(hdev->name) + strlen(suffix) + 2, - GFP_KERNEL); - if (name) { - sprintf(name, "%s %s", hdev->name, suffix); - hi->input->name = name; - } - } + if (suffix) + hi->input->name = devm_kasprintf(&hdev->dev, GFP_KERNEL, + "%s %s", hdev->name, suffix); return 0; } From patchwork Thu Aug 24 06:14:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Rameshbabu X-Patchwork-Id: 717053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 43B3EC3DA6F for ; Thu, 24 Aug 2023 06:16:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240015AbjHXGPe (ORCPT ); Thu, 24 Aug 2023 02:15:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240088AbjHXGPO (ORCPT ); Thu, 24 Aug 2023 02:15:14 -0400 Received: from mail-0301.mail-europe.com (mail-0301.mail-europe.com [188.165.51.139]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 055F710F4 for ; Wed, 23 Aug 2023 23:15:12 -0700 (PDT) Date: Thu, 24 Aug 2023 06:14:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1692857708; x=1693116908; bh=8sk89UlcqL9XG6lGf8oHAA4Tl8QyXr9EsvcswnO8N6A=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=C7EXUxS0W87tejNsZutcufC5uiAxyLDCMeRBSzjdIi3GtjZGsRDtRa/PEfFPoVWYW B2Y8ETX7OVsjnTw5dLaf3nH00fXAEECXPPNoybec/lBl3xIVcsfpYwiiMxVFJR7Kvv PgaKLWszMU/gCtllI/huD2Meytt7C7D9TYz/2RliUcCOkqd0Et+ivE8Ikw7EFg5eBY GF80QhA6PqLEzDituG2AQ7GDqHxcNgippCe6N9F6LxyP/ILUOGAVYtg7tikdu6hpSc b2ecIdOLTZRVFzLtZeG+SEXfZ1kvAYgvoR0qEvBneXp/L0Sjon3hjJbSnQ1fMXEe73 X930OsiNjr5jA== To: linux-input@vger.kernel.org From: Rahul Rameshbabu Cc: Benjamin Tissoires , Jiri Kosina , Dmitry Torokhov , Maxime Ripard , Rahul Rameshbabu Subject: [PATCH HID 3/3] HID: nvidia-shield: Reference hid_device devm allocation of input_dev name Message-ID: <20230824061308.222021-4-sergeantsagara@protonmail.com> In-Reply-To: <20230824061308.222021-1-sergeantsagara@protonmail.com> References: <20230824061308.222021-1-sergeantsagara@protonmail.com> Feedback-ID: 26003777:user:proton MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Rahul Rameshbabu Use hid_device for devm allocation of the input_dev name to avoid a use-after-free. input_unregister_device would trigger devres cleanup of all resources associated with the input_dev, free-ing the name. The name would subsequently be used in a uevent fired at the end of unregistering the input_dev. Reported-by: Maxime Ripard Closes: https://lore.kernel.org/linux-input/ZOZIZCND+L0P1wJc@penguin/T/#m443f3dce92520f74b6cf6ffa8653f9c92643d4ae Fixes: 09308562d4af ("HID: nvidia-shield: Initial driver implementation with Thunderstrike support") Suggested-by: Maxime Ripard Suggested-by: Dmitry Torokhov Signed-off-by: Rahul Rameshbabu --- drivers/hid/hid-nvidia-shield.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hid/hid-nvidia-shield.c b/drivers/hid/hid-nvidia-shield.c index a928ad2be62d..084179a6be86 100644 --- a/drivers/hid/hid-nvidia-shield.c +++ b/drivers/hid/hid-nvidia-shield.c @@ -164,7 +164,7 @@ static struct input_dev *shield_allocate_input_dev(struct hid_device *hdev, idev->id.product = hdev->product; idev->id.version = hdev->version; idev->uniq = hdev->uniq; - idev->name = devm_kasprintf(&idev->dev, GFP_KERNEL, "%s %s", hdev->name, + idev->name = devm_kasprintf(&hdev->dev, GFP_KERNEL, "%s %s", hdev->name, name_suffix); if (!idev->name) goto err_name;