Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757932AbaDBDyD (ORCPT ); Tue, 1 Apr 2014 23:54:03 -0400 Received: from 94.43.138.210.xn.2iij.net ([210.138.43.94]:59605 "EHLO mail.st-paulia.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756116AbaDBDyA (ORCPT ); Tue, 1 Apr 2014 23:54:00 -0400 X-Greylist: delayed 315 seconds by postgrey-1.27 at vger.kernel.org; Tue, 01 Apr 2014 23:54:00 EDT Message-ID: <533B889A.2060105@linux-ipv6.org> Date: Wed, 02 Apr 2014 12:48:42 +0900 From: YOSHIFUJI Hideaki Organization: USAGI Project User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: davem@davemloft.net CC: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Vegard Nossum , Dan Carpenter , yoshfuji@linux-ipv6.org Subject: [PATCH] isdnloop: Validate NUL-terminated strings from user. References: <20140401.161838.1562296825577866979.davem@davemloft.net> In-Reply-To: <20140401.161838.1562296825577866979.davem@davemloft.net> Content-Type: text/plain; charset=ISO-2022-JP Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return -EINVAL unless all of user-given strings are correctly NUL-terminated. Signed-off-by: YOSHIFUJI Hideaki --- drivers/isdn/isdnloop/isdnloop.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c index 02125e6..e1f8748 100644 --- a/drivers/isdn/isdnloop/isdnloop.c +++ b/drivers/isdn/isdnloop/isdnloop.c @@ -1070,6 +1070,12 @@ isdnloop_start(isdnloop_card *card, isdnloop_sdef *sdefp) return -EBUSY; if (copy_from_user((char *) &sdef, (char *) sdefp, sizeof(sdef))) return -EFAULT; + + for (i = 0; i < 3; i++) { + if (!memchr(sdef.num[i], 0, sizeof(sdef.num[i]))) + return -EINVAL; + } + spin_lock_irqsave(&card->isdnloop_lock, flags); switch (sdef.ptype) { case ISDN_PTYPE_EURO: -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/