From 68ba4fe4a1c48e9b6d7d76f2120a114d023ffd59 Mon Sep 17 00:00:00 2001 From: "R. Imura" Date: Thu, 8 Sep 2005 15:46:38 +0000 Subject: MFC: check capable size of given strings correctly. 1.4 src/contrib/smbfs/lib/smb/kiconv.c 1.2 src/lib/libkiconv/xlat16_sysctl.c 1.11 src/sys/libkern/iconv.c Approved by: re (scottl) --- sys/libkern/iconv.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sys/libkern') diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c index 389f21ac8c47..4751d4b72615 100644 --- a/sys/libkern/iconv.c +++ b/sys/libkern/iconv.c @@ -379,6 +379,12 @@ iconv_sysctl_add(SYSCTL_HANDLER_ARGS) return EINVAL; if (din.ia_datalen > ICONV_CSMAXDATALEN) return EINVAL; + if (strlen(din.ia_from) >= ICONV_CSNMAXLEN) + return EINVAL; + if (strlen(din.ia_to) >= ICONV_CSNMAXLEN) + return EINVAL; + if (strlen(din.ia_converter) >= ICONV_CNVNMAXLEN) + return EINVAL; if (iconv_lookupconv(din.ia_converter, &dcp) != 0) return EINVAL; error = iconv_register_cspair(din.ia_to, din.ia_from, dcp, NULL, &csp); -- cgit v1.3