lkml.org 
[lkml]   [2018]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/18] drm property: change strncpy+truncation to strlcpy
    Date
    Using strlcpy fixes this new gcc warning:
    drivers/gpu/drm/drm_property.c: In function ‘drm_property_create’:
    drivers/gpu/drm/drm_property.c:125:2: warning: ‘strncpy’ specified bound 32 equals destination size [-Wstringop-truncation]
    strncpy(property->name, name, DRM_PROP_NAME_LEN);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    Generated by scripts/coccinelle/misc/strncpy_truncation.cocci

    Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
    ---

    Please see https://marc.info/?l=linux-kernel&m=153144450722324&w=2 (the
    first patch of the serie) for the motivation behind this patch

    drivers/gpu/drm/drm_property.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/drm_property.c b/drivers/gpu/drm/drm_property.c
    index cdb10f885a4f..8f0ccfa91f8b 100644
    --- a/drivers/gpu/drm/drm_property.c
    +++ b/drivers/gpu/drm/drm_property.c
    @@ -122,8 +122,7 @@ struct drm_property *drm_property_create(struct drm_device *dev,
    property->num_values = num_values;
    INIT_LIST_HEAD(&property->enum_list);

    - strncpy(property->name, name, DRM_PROP_NAME_LEN);
    - property->name[DRM_PROP_NAME_LEN-1] = '\0';
    + strlcpy(property->name, name, DRM_PROP_NAME_LEN);

    list_add_tail(&property->head, &dev->mode_config.property_list);

    @@ -416,8 +415,7 @@ int drm_property_add_enum(struct drm_property *property,
    if (!prop_enum)
    return -ENOMEM;

    - strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN);
    - prop_enum->name[DRM_PROP_NAME_LEN-1] = '\0';
    + strlcpy(prop_enum->name, name, DRM_PROP_NAME_LEN);
    prop_enum->value = value;

    property->values[index] = value;
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-07-15 22:06    [W:4.169 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site