From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751864AbdBOD2R (ORCPT ); Tue, 14 Feb 2017 22:28:17 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33450 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751827AbdBOD2P (ORCPT ); Tue, 14 Feb 2017 22:28:15 -0500 X-ME-Sender: X-Sasl-enc: 93TM8Yd4P8IwoymZzQZVyTLPGdTPX0MvrwwAhtI+3T3Y 1487129269 From: "Tobin C. Harding" To: Thomas Petazzoni , noralf@tronnes.org Cc: Greg Kroah-Hartman , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, "Tobin C. Harding" Subject: [PATCH v2 3/3] staging: fbtft: Add check on strlcpy() return value Date: Wed, 15 Feb 2017 14:27:25 +1100 Message-Id: <1487129245-24970-4-git-send-email-me@tobin.cc> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487129245-24970-1-git-send-email-me@tobin.cc> References: <1487129245-24970-1-git-send-email-me@tobin.cc> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return value of strlcpy() is not checked. Name string is silently truncated if longer that SPI_NAME_SIZE, whilst not detrimental to the program logic it would be nice to notify the user. Module is currently quite verbose, adding extra pr_warn() calls will not overly impact this verbosity. Check return value from call to strlcpy(). If source string is truncated call pr_warn() to notify user. Signed-off-by: Tobin C. Harding --- drivers/staging/fbtft/fbtft_device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/staging/fbtft/fbtft_device.c b/drivers/staging/fbtft/fbtft_device.c index 5fbdd37..78baf46 100644 --- a/drivers/staging/fbtft/fbtft_device.c +++ b/drivers/staging/fbtft/fbtft_device.c @@ -1483,7 +1483,13 @@ static int __init fbtft_device_init(void) displays[i].pdev->name = name; displays[i].spi = NULL; } else { - strlcpy(displays[i].spi->modalias, name, SPI_NAME_SIZE); + size_t len; + + len = strlcpy(displays[i].spi->modalias, name, + SPI_NAME_SIZE); + if (len >= SPI_NAME_SIZE) + pr_warn("modalias (name) truncated to: %s\n", + displays[i].spi->modalias); displays[i].pdev = NULL; } } -- 2.7.4