From patchwork Sat Oct 11 22:02:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Strandqvist X-Patchwork-Id: 5071171 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6A9629F472 for ; Sun, 12 Oct 2014 15:53:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A311D201BB for ; Sun, 12 Oct 2014 15:53:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B0B8D2018E for ; Sun, 12 Oct 2014 15:53:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA7A489E2A; Sun, 12 Oct 2014 08:53:36 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-la0-f51.google.com (mail-la0-f51.google.com [209.85.215.51]) by gabe.freedesktop.org (Postfix) with ESMTP id 48F1E89CE0 for ; Sat, 11 Oct 2014 15:00:25 -0700 (PDT) Received: by mail-la0-f51.google.com with SMTP id ge10so5022535lab.10 for ; Sat, 11 Oct 2014 15:00:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oEERiKD+fq/nyDH1GZcoQJOurUB9B2lP7fqXMkuySHo=; b=MQqDQFLn6CN6WldOOc0dQIy//WDeKlph4pTGQxub4LcvlnbuOQnROsUSmJ289BCo7P LPteJyhXfgU3iGOIZxu22fOrEVf00CAtqgAjeuVYWpi21S/FvkzStMzy5md2YYdvuW67 /QqHPKP4641xrXeek3GulB0XjhCi/LDfiAXTXfola102aaxovfn6QrH6rnPUORlDcDor FnA6qTp9YwREEWMuQr1OTaquxNvbJf5/qTP53wskDsat1zwr3arq3MeHSQySuWqzBQXo MGwL+1ddrKMe8d/Nt5gjw4qGe0X3dM7xUV3d/8hdipcCzEveoKAUDj7ZuaHqEPxMifxV oadg== X-Gm-Message-State: ALoCoQkkWbbYNnYdOd+9BGYdKPwyGYkGbo2JXLSRqkIUakORzLfkoJl2lDzQ8zVvDWDgSXNMmn7h X-Received: by 10.152.22.7 with SMTP id z7mr13934545lae.6.1413064824288; Sat, 11 Oct 2014 15:00:24 -0700 (PDT) Received: from localhost.localdomain (h-245-62.a218.priv.bahnhof.se. [85.24.245.62]) by mx.google.com with ESMTPSA id bk5sm3076210lbd.30.2014.10.11.15.00.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Oct 2014 15:00:23 -0700 (PDT) From: Rickard Strandqvist To: David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH v2] gpu: drm: drm_dp_mst_topology.c: Fix improper use of strncat Date: Sun, 12 Oct 2014 00:02:32 +0200 Message-Id: <1413064952-10466-1-git-send-email-rickard_strandqvist@spectrumdigital.se> X-Mailer: git-send-email 1.7.10.4 X-Mailman-Approved-At: Sun, 12 Oct 2014 08:53:35 -0700 Cc: linux-kernel@vger.kernel.org, Rickard Strandqvist X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY, URIBL_RHS_DOB autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fixed wrong usage of strncat, switched to strlcpy. While sending the string size to function to reduce the potential for misuse in future. Signed-off-by: Rickard Strandqvist Reviewed-by: Jani Nikula --- drivers/gpu/drm/drm_dp_mst_topology.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index ac3c273..2a146d1 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -995,19 +995,20 @@ static void drm_dp_check_port_guid(struct drm_dp_mst_branch *mstb, static void build_mst_prop_path(struct drm_dp_mst_port *port, struct drm_dp_mst_branch *mstb, - char *proppath) + char *proppath, + size_t proppath_size) { int i; char temp[8]; - snprintf(proppath, 255, "mst:%d", mstb->mgr->conn_base_id); + snprintf(proppath, proppath_size, "mst:%d", mstb->mgr->conn_base_id); for (i = 0; i < (mstb->lct - 1); i++) { int shift = (i % 2) ? 0 : 4; int port_num = mstb->rad[i / 2] >> shift; - snprintf(temp, 8, "-%d", port_num); - strncat(proppath, temp, 255); + snprintf(temp, sizeof(temp), "-%d", port_num); + strlcat(proppath, temp, proppath_size); } - snprintf(temp, 8, "-%d", port->port_num); - strncat(proppath, temp, 255); + snprintf(temp, sizeof(temp), "-%d", port->port_num); + strlcat(proppath, temp, proppath_size); } static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, @@ -1078,7 +1079,7 @@ static void drm_dp_add_port(struct drm_dp_mst_branch *mstb, if (created && !port->input) { char proppath[255]; - build_mst_prop_path(port, mstb, proppath); + build_mst_prop_path(port, mstb, proppath, sizeof(proppath)); port->connector = (*mstb->mgr->cbs->add_connector)(mstb->mgr, port, proppath); }