From: Jani Nikula <jani.nikula@linux.intel.com>
To: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>,
David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org
Cc: linux-kernel@vger.kernel.org,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Subject: Re: [PATCH v2] gpu: drm: drm_dp_mst_topology.c: Fix improper use of strncat
Date: Mon, 13 Oct 2014 11:02:40 +0300 [thread overview]
Message-ID: <87y4skgzxb.fsf@intel.com> (raw)
In-Reply-To: <1413064952-10466-1-git-send-email-rickard_strandqvist@spectrumdigital.se>
On Sun, 12 Oct 2014, Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se> wrote:
> 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 <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> 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);
> }
>
> --
> 1.7.10.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Jani Nikula, Intel Open Source Technology Center
prev parent reply other threads:[~2014-10-13 8:02 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-11 22:02 Rickard Strandqvist
2014-10-13 8:02 ` Jani Nikula [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87y4skgzxb.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rickard_strandqvist@spectrumdigital.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome