From patchwork Wed Feb 22 14:44:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 60561 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp615569wrd; Wed, 22 Feb 2023 06:46:24 -0800 (PST) X-Google-Smtp-Source: AK7set9Ae59hUD/XazwWA5+vR6Z4s3Vq5j7vXqi5bXZ+YGyigiovF96M7h164xG14zCAZ1HH1Wop X-Received: by 2002:a17:907:9629:b0:870:baa6:6762 with SMTP id gb41-20020a170907962900b00870baa66762mr19177221ejc.14.1677077184234; Wed, 22 Feb 2023 06:46:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677077184; cv=none; d=google.com; s=arc-20160816; b=HTwyHenGi+rzK0IspCY6VhuXjLrE+7GcZeVIMgdMhk2/ZTCrN8K8Hkabe9nyDJkKOk 7FtfWaX/9hsSC8MYuI7sWuaKFbc3RF7To/JbN1ne8Sat9eLcBjmKEAU1eDwcM+5i/BEC 5hsySmnNOQhJYG4qi6EeCxSwNKbBNkXr7ERUcxmEEXFnmZ1XWX1MrI3svUPbggCDvTcc fCKC7X4Z2WtwlTHUjk1MY6jsbUnlB3TP0K0NHBZuWlNFgCqWvDsNWX+axelPhvcb2e1Q XqKxlJelK//No+4xdiUZD0JT+0tFyTLu2HnuHR7dNWaBBM47kga/f4IPSGoQDSEsXrAk hYKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9dadzXX6cbudRfVYbEzwbLwspwzii5vVla/610fZmbs=; b=wCLFonVwHFVBEjylAzxlQPvIiAgf9VpQHjTycqnd+vARmq9+myWKyTvm8SmLJycQpj wPt73IS49bIUckXbCCSeewDr1v9w8Hy5eTvk0mch1bXifqi+fRtdHXiwcTui9UVc3iUP vOwUdttGT92tw3v/6BCdMsk+EHOdhL9OilmEGgT5SuwPRjj44MnXOiEESA7LR2zH0Mwb faQem5W0f2AHeDhDnl5j950/we+IAgB20FyStLsJ/wKAbWNa7aRMBqvQ2F35YbUPYGvx Gv70cnMmg96w+ZNsiVcgbu1sHzbrMapnr47KNGKnG8F7LET1NAwhLt/xEiBg6EXmEMzk t8iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hFa4NWrU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fd9-20020a1709072a0900b008e97f723e53si847013ejc.782.2023.02.22.06.46.01; Wed, 22 Feb 2023 06:46:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hFa4NWrU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231235AbjBVOpA (ORCPT + 99 others); Wed, 22 Feb 2023 09:45:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232124AbjBVOoq (ORCPT ); Wed, 22 Feb 2023 09:44:46 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 903141CF52 for ; Wed, 22 Feb 2023 06:44:19 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id m14-20020a7bce0e000000b003e00c739ce4so5512929wmc.5 for ; Wed, 22 Feb 2023 06:44:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9dadzXX6cbudRfVYbEzwbLwspwzii5vVla/610fZmbs=; b=hFa4NWrU8gOj2iDh8IhqNZ/4xMtzeGQqR8dqpkeBWFrz/hEsxZCy+6AuAIYpIctTTP el3LjzRGeFJgFUmu3gJRQcxvYGQYQTx3J2hobKOfwc2re0fGryrolzPKrr1CrO1JYRGU i7Pwac0yeyVnCLqaJ9dE+sWKfEGAYowY69uPjHxsgxji61WFQj1JYGeXv1tPqUj5DU9e +65vUzuULmLf53iyjWDJ0n6Ii0bVUKaKzu1rRHxN5+LhsKjcqiKi+hScJAjzhMaqgV8J djTit/6lD3amGDUwE/v7Lkr3onwLnLwo1tnhQ0Fz+kEdpyAyf8zRdzO3Q3cG4fYaNfJU IxpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9dadzXX6cbudRfVYbEzwbLwspwzii5vVla/610fZmbs=; b=mfu/f0tfE01C2/LA6+HVMA7prngH/4rQ34jfpGlEKON+Jhu2Vw1+/TTb0qNVkl5h74 9PFSFh5fsilH1nS4LzSE9m13JCBgvW2Fkywg78c0UA096do/RW6pk8VFR/UXdZ1aCv3g sGs9gUiYYGzb0WYuONjmhAGpjOjOnzRZ/IiOFsqwbisqM1f9CWVNVQh9yLcsn+MgkGvX 7DsHjAw+HB53VZOLLKGqV532ZmiGFW3EMZOmjjJHxWXWQi5qTGA1GlRof1PasEQOVtC4 tnqpZx19krFPYca1c9jXFHiflWxu+P88mSJbnmcCDjAMNDSLuc1wck1BaS3YYTPuElg6 KooA== X-Gm-Message-State: AO0yUKUeMDHQHWTKUgIbG5TLgnKSquXV0jbX22DXWigfueaej1IYLGZM mph6JtF6fPVh+jizDqnFneXxug== X-Received: by 2002:a05:600c:4495:b0:3df:b5ae:5289 with SMTP id e21-20020a05600c449500b003dfb5ae5289mr6368054wmo.8.1677077057306; Wed, 22 Feb 2023 06:44:17 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id o10-20020a1c750a000000b003e7c89b3514sm5059776wmc.23.2023.02.22.06.44.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Feb 2023 06:44:16 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Vinod Koul , Bard Liao , Pierre-Louis Bossart , Sanyog Kale , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/2] soundwire: qcom: gracefully handle too many ports in DT Date: Wed, 22 Feb 2023 15:44:12 +0100 Message-Id: <20230222144412.237832-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230222144412.237832-1-krzysztof.kozlowski@linaro.org> References: <20230222144412.237832-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758542885612895608?= X-GMAIL-MSGID: =?utf-8?q?1758542885612895608?= There are two issues related to the number of ports coming from Devicetree when exceeding in total QCOM_SDW_MAX_PORTS. Both lead to incorrect memory accesses: 1. With DTS having too big value of input or output ports, the driver, when copying port parameters from local/stack arrays into 'pconfig' array in 'struct qcom_swrm_ctrl', will iterate over their sizes. 2. If DTS also has too many parameters for these ports (e.g. qcom,ports-sinterval-low), the driver will overflow buffers on the stack when reading these properties from DTS. Add a sanity check so incorrect DTS will not cause kernel memory corruption. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Konrad Dybcio Reviewed-by: Srinivas Kandagatla --- drivers/soundwire/qcom.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 79bebcecde6d..c296e0bf897b 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -1218,6 +1218,9 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl) ctrl->num_dout_ports = val; nports = ctrl->num_dout_ports + ctrl->num_din_ports; + if (nports > QCOM_SDW_MAX_PORTS) + return -EINVAL; + /* Valid port numbers are from 1-14, so mask out port 0 explicitly */ set_bit(0, &ctrl->dout_port_mask); set_bit(0, &ctrl->din_port_mask);