From mboxrd@z Thu Jan 1 00:00:00 1970 From: peter.ujfalusi@ti.com (Peter Ujfalusi) Date: Mon, 4 Feb 2013 10:00:27 +0100 Subject: [PATCH] ARM:omap2: using strlcpy instead of strncpy In-Reply-To: <20130201224546.GG22517@atomide.com> References: <51090829.1010109@asianux.com> <20130201224546.GG22517@atomide.com> Message-ID: <510F78AB.4000602@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Tony, On 02/01/2013 11:45 PM, Tony Lindgren wrote: > * Chen Gang [130130 03:50]: >> >> the fields must be null-terminated: >> the caller may use it as null-terminted string, next. > > Added Peter to cc on this one too, it's best that he queues > all the twl changes. I can create a branch for you in our gitorious tree (git://gitorious.org/omap-audio/linux-audio.git) for this patch. But I think for now it would be best if you could take this via linux-omap (the file is under arch/arm/mach-omap2 anyways) Regards, P?ter > > Tony > >> Signed-off-by: Chen Gang >> --- >> arch/arm/mach-omap2/twl-common.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c >> index e49b40b..6a7aec6 100644 >> --- a/arch/arm/mach-omap2/twl-common.c >> +++ b/arch/arm/mach-omap2/twl-common.c >> @@ -23,6 +23,7 @@ >> #include >> #include >> #include >> +#include >> #include >> #include >> >> @@ -56,7 +57,7 @@ void __init omap_pmic_init(int bus, u32 clkrate, >> struct twl4030_platform_data *pmic_data) >> { >> omap_mux_init_signal("sys_nirq", OMAP_PIN_INPUT_PULLUP | OMAP_PIN_OFF_WAKEUPENABLE); >> - strncpy(pmic_i2c_board_info.type, pmic_type, >> + strlcpy(pmic_i2c_board_info.type, pmic_type, >> sizeof(pmic_i2c_board_info.type)); >> pmic_i2c_board_info.irq = pmic_irq; >> pmic_i2c_board_info.platform_data = pmic_data; >> -- >> 1.7.10.4