From patchwork Tue Nov 19 05:15:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179639 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp151553ilf; Mon, 18 Nov 2019 21:30:04 -0800 (PST) X-Google-Smtp-Source: APXvYqyyVIe0PNuaiuu/oTyOws9p8b4PdkP4qRQfdAmtNob94q0aDRCGfoQdQfX7TY4q7IRY390e X-Received: by 2002:a17:906:4d58:: with SMTP id b24mr31916386ejv.277.1574141403963; Mon, 18 Nov 2019 21:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574141403; cv=none; d=google.com; s=arc-20160816; b=Zl6wiFcPBbZ7RrqZ13SZonO7HpkgbNwO27c9DDm4QCrEL/aQcOwJlPqg9KIwIW17a4 bsh8ssRJ/42UK55Bw7ZZEvflVDNaqrMMF9xB/P3JFRyNrjZK56J4sBr8ktlK1yuZ1nUO jbEcc4FvBmiJERza/kw2PdcH9agz1/dH8u/4hZ1k2Y7bTt37skokvlJWEKERbyzB2yp1 0zWdjHTsI9C3DOpJF1JFRX3KLM/r2EezKablMgqQVQNez+v1OfUNKFxNQh4Cu/RPvwY6 MFi/jXQUFhf6brbfLsiGqQ9jyC2uXTPwYrcTuLoRWteZ2/XPPVjLJW1k2/GVr+WKkm/S AmaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=P9yCFgUWoSL6SfSvjr9NgzzVFkKCkMsqkV/KyO/JMH8=; b=UTYWJv21Pkf9LnfLDLALR/mcmJe3OQi+6BjdNKRNnWBb4qN6gXA+lubBw/p46xj6J5 j6JQTO4ncxhxf7p2A2IYzJw3BkNKp5Oe1GDpHCjSXwm5ty5yIes69rYhIXSdvmTeMOs3 qJg1ltHlXyF+Ou/3Vnf7HgqJ8KDHx0Lno7ftGsqPnkOR9xTnfy3pFb1emuiTQxCJZdIr 37nzhByqRNzXGfmWaU49s8PFQGOAqzBiwqjYVELXpc05mth1YoEguclMjLBzS+dLuXNq +IPL1HgjU9jFsaFcejqUpyuCF2Xj33+LC+NVkLE7VVUy6XuELV4fJLGW/LXSsBzZwpAI 3e3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YYVvKnak; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l27si16006539edc.358.2019.11.18.21.30.03; Mon, 18 Nov 2019 21:30:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YYVvKnak; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727706AbfKSFaB (ORCPT + 26 others); Tue, 19 Nov 2019 00:30:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:48616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729051AbfKSF37 (ORCPT ); Tue, 19 Nov 2019 00:29:59 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 C1E7921939; Tue, 19 Nov 2019 05:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574141398; bh=zgtQn59xKSHLgHf3t2ThmqyQQy/k5Hd9egH/wHnXQc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YYVvKnakNDy3XFDcc9sZLgegLi5njzdovU8Xchh1YKQUZnTCs86OjXXxlO3b3u+59 BarW2ah6hp1+u5fCMxulKdTUKG92w3AHky4Jv4dgBJ232Ggk1Td3jELcOalYw8Xn+u +foTZzAVEANSMdi+yOdEeonjt4EaaSHIRCfzqJK8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Olof Johansson , Sudeep Holla , Sasha Levin Subject: [PATCH 4.19 148/422] firmware: arm_scmi: use strlcpy to ensure NULL-terminated strings Date: Tue, 19 Nov 2019 06:15:45 +0100 Message-Id: <20191119051408.258753348@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sudeep Holla [ Upstream commit ca64b719a1e665ac7449b6a968059176af7365a8 ] Replace all the memcpy() for copying name strings from the firmware with strlcpy() to make sure we are bounded by the source buffer size and we also always have NULL-terminated strings. This is needed to avoid out of bounds accesses if the firmware returns a non-terminated string. Reported-by: Olof Johansson Acked-by: Olof Johansson Signed-off-by: Sudeep Holla Signed-off-by: Sasha Levin --- drivers/firmware/arm_scmi/base.c | 2 +- drivers/firmware/arm_scmi/clock.c | 2 +- drivers/firmware/arm_scmi/perf.c | 2 +- drivers/firmware/arm_scmi/power.c | 2 +- drivers/firmware/arm_scmi/sensors.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/drivers/firmware/arm_scmi/base.c b/drivers/firmware/arm_scmi/base.c index 9dff33ea6416f..204390297f4bd 100644 --- a/drivers/firmware/arm_scmi/base.c +++ b/drivers/firmware/arm_scmi/base.c @@ -208,7 +208,7 @@ static int scmi_base_discover_agent_get(const struct scmi_handle *handle, ret = scmi_do_xfer(handle, t); if (!ret) - memcpy(name, t->rx.buf, SCMI_MAX_STR_SIZE); + strlcpy(name, t->rx.buf, SCMI_MAX_STR_SIZE); scmi_xfer_put(handle, t); diff --git a/drivers/firmware/arm_scmi/clock.c b/drivers/firmware/arm_scmi/clock.c index e4119eb34986c..30fc04e284312 100644 --- a/drivers/firmware/arm_scmi/clock.c +++ b/drivers/firmware/arm_scmi/clock.c @@ -111,7 +111,7 @@ static int scmi_clock_attributes_get(const struct scmi_handle *handle, ret = scmi_do_xfer(handle, t); if (!ret) - memcpy(clk->name, attr->name, SCMI_MAX_STR_SIZE); + strlcpy(clk->name, attr->name, SCMI_MAX_STR_SIZE); else clk->name[0] = '\0'; diff --git a/drivers/firmware/arm_scmi/perf.c b/drivers/firmware/arm_scmi/perf.c index 64342944d9175..87c99d296ecd3 100644 --- a/drivers/firmware/arm_scmi/perf.c +++ b/drivers/firmware/arm_scmi/perf.c @@ -174,7 +174,7 @@ scmi_perf_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->mult_factor = (dom_info->sustained_freq_khz * 1000) / dom_info->sustained_perf_level; - memcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE); + strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE); } scmi_xfer_put(handle, t); diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c index cfa033b05aed5..62f3401a1f01e 100644 --- a/drivers/firmware/arm_scmi/power.c +++ b/drivers/firmware/arm_scmi/power.c @@ -106,7 +106,7 @@ scmi_power_domain_attributes_get(const struct scmi_handle *handle, u32 domain, dom_info->state_set_notify = SUPPORTS_STATE_SET_NOTIFY(flags); dom_info->state_set_async = SUPPORTS_STATE_SET_ASYNC(flags); dom_info->state_set_sync = SUPPORTS_STATE_SET_SYNC(flags); - memcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE); + strlcpy(dom_info->name, attr->name, SCMI_MAX_STR_SIZE); } scmi_xfer_put(handle, t); diff --git a/drivers/firmware/arm_scmi/sensors.c b/drivers/firmware/arm_scmi/sensors.c index 27f2092b9882a..b53d5cc9c9f6c 100644 --- a/drivers/firmware/arm_scmi/sensors.c +++ b/drivers/firmware/arm_scmi/sensors.c @@ -140,7 +140,7 @@ static int scmi_sensor_description_get(const struct scmi_handle *handle, s = &si->sensors[desc_index + cnt]; s->id = le32_to_cpu(buf->desc[cnt].id); s->type = SENSOR_TYPE(attrh); - memcpy(s->name, buf->desc[cnt].name, SCMI_MAX_STR_SIZE); + strlcpy(s->name, buf->desc[cnt].name, SCMI_MAX_STR_SIZE); } desc_index += num_returned;