From patchwork Tue Nov 19 05:18:34 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: 179695 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp168169ilf; Mon, 18 Nov 2019 21:49:06 -0800 (PST) X-Google-Smtp-Source: APXvYqxBVWS7TzWOMp3xVxBIvQflxCc9wGShYP8i20nX1+kySkAofFc59CHNVhcr/UxSRZsSD1bR X-Received: by 2002:a17:906:8054:: with SMTP id x20mr32014986ejw.68.1574142546261; Mon, 18 Nov 2019 21:49:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574142546; cv=none; d=google.com; s=arc-20160816; b=XymrIhYL5B8uATzt1UkN1kHcYgVwUYJOg2C97wNunFq5prYl6lBqBwHvD8Rtqoo9zr 0WNawBe92mH1iU9Ht4mdZGLRgX/AtOQeqRycMntesnyrlAkYk6TOL434w3nZQvOxIibQ OwGzJRHG9e9axixsqEL5aLQFxhxkmmpJxdb3djAjWQy2b953ZWMLAaCCcOb+jNvqk34E au6+hO9BMMw19zwE6XBrn6mphskM39PW5mrPG6OC8X0s/NLpwk4zsezjg7P5WSLWqBj8 bzo6iTEQ7OCik8CiVFWOmMwV+cqFVKGO2XOOjarSzTu7rW2565UcwzJaH1n+P9tMawb+ Dtng== 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=4SfYdpMAZA5tF67MBl8gD3vnW3UrMxqN6p0evxCoDm8=; b=pLS2C5N5Sch27wNAP34wuSxmyd+iG8tfUNJQb66DcAKaOms3jCFxuB3s47QQXFG5lp dypJwqntst/tCzLy7sfEUXpR02e8CUIJBQeyLHMEwGnVGkMb6cP+wMuf1iLhMDhlCCg6 aWE/8GDGulJ1l5kSvdMbkQZb9dAScL8klfxcaCRzkaL3ZijMopo6DIpaYmYyXHCMJVu1 EBEfYy6SxrJPKY3z53T4JcFuCamO8dXKYPnTcu3T50MThV5oaG4WdQLx4hMVeCxAeObz CfJqoRbQm54Zut85fRidyQqF9NVT5w7QdfEWJYoeSxjZlugIZiByG5LvAaQxVsIxLmNl U2og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=UMRCAfJb; 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 c25si12980715ejm.224.2019.11.18.21.49.06; Mon, 18 Nov 2019 21:49:06 -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=UMRCAfJb; 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 S1731436AbfKSFtD (ORCPT + 26 others); Tue, 19 Nov 2019 00:49:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:45576 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731424AbfKSFs6 (ORCPT ); Tue, 19 Nov 2019 00:48:58 -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 7CAD320862; Tue, 19 Nov 2019 05:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142538; bh=fTe/6jv6vp2P2ZrGxFtNky6NeEAfIueFoy7sJP/UR2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UMRCAfJbeR52VIJi9GXGRhulBK0q/D5p6NiR7p6Qf6BjfjaqEpzssxbq28YHEZ+Cp W25hIjUIlqeIm0v/0oli0lhI2ybsS4kZvECZt4RzFzULnl9t9C7qj50kgLBNcEYp/8 5RJtYeEUmBW2RixX6yP8WIX0tscWNfI2UaAmrQQM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Niklas Cassel , Bjorn Andersson , Andy Gross , Sasha Levin Subject: [PATCH 4.14 114/239] soc: qcom: wcnss_ctrl: Avoid string overflow Date: Tue, 19 Nov 2019 06:18:34 +0100 Message-Id: <20191119051328.514908397@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051255.850204959@linuxfoundation.org> References: <20191119051255.850204959@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: Niklas Cassel [ Upstream commit 4c96ed170d658d8826d94edec8ac93ee777981a2 ] 'chinfo.name' is used as a NUL-terminated string, but using strncpy() with the length equal to the buffer size may result in lack of the termination: drivers//soc/qcom/wcnss_ctrl.c: In function 'qcom_wcnss_open_channel': drivers//soc/qcom/wcnss_ctrl.c:284:2: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation] strncpy(chinfo.name, name, sizeof(chinfo.name)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This changes it to use the safer strscpy() instead. Signed-off-by: Niklas Cassel Reviewed-by: Bjorn Andersson Signed-off-by: Andy Gross Signed-off-by: Sasha Levin --- drivers/soc/qcom/wcnss_ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/drivers/soc/qcom/wcnss_ctrl.c b/drivers/soc/qcom/wcnss_ctrl.c index df3ccb30bc2dd..373400dd816d6 100644 --- a/drivers/soc/qcom/wcnss_ctrl.c +++ b/drivers/soc/qcom/wcnss_ctrl.c @@ -281,7 +281,7 @@ struct rpmsg_endpoint *qcom_wcnss_open_channel(void *wcnss, const char *name, rp struct rpmsg_channel_info chinfo; struct wcnss_ctrl *_wcnss = wcnss; - strncpy(chinfo.name, name, sizeof(chinfo.name)); + strscpy(chinfo.name, name, sizeof(chinfo.name)); chinfo.src = RPMSG_ADDR_ANY; chinfo.dst = RPMSG_ADDR_ANY;