From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944617AbdEZTK6 (ORCPT ); Fri, 26 May 2017 15:10:58 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34742 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S944550AbdEZTKx (ORCPT ); Fri, 26 May 2017 15:10:53 -0400 From: Karim Eshapa To: bp@alien8.de Cc: mchehab@kernel.org, linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Karim Eshapa Subject: [PATCH v2] edac: edac_mc_sysfs.c: Use strlcpy to Copy a C-string into a sized buffer Date: Fri, 26 May 2017 21:10:21 +0200 Message-Id: <1495825821-5295-1-git-send-email-karim.eshapa@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use strlcpy with sized buffer instead of strncpy to avoid non NUL-terminated source strings problems. Signed-off-by: Karim Eshapa --- drivers/edac/edac_mc_sysfs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 445862d..e893b94 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c @@ -251,8 +251,7 @@ static ssize_t channel_dimm_label_store(struct device *dev, if (copy_count == 0 || copy_count >= sizeof(rank->dimm->label)) return -EINVAL; - strncpy(rank->dimm->label, data, copy_count); - rank->dimm->label[copy_count] = '\0'; + strlcpy(rank->dimm->label, data, copy_count); return count; } @@ -530,8 +529,7 @@ static ssize_t dimmdev_label_store(struct device *dev, if (copy_count == 0 || copy_count >= sizeof(dimm->label)) return -EINVAL; - strncpy(dimm->label, data, copy_count); - dimm->label[copy_count] = '\0'; + strlcpy(dimm->label, data, copy_count); return count; } -- 2.7.4