From owner-freebsd-hackers@FreeBSD.ORG Sun Mar 22 13:15:53 2015 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68218A2E for ; Sun, 22 Mar 2015 13:15:53 +0000 (UTC) Received: from ustc.edu.cn (email6.ustc.edu.cn [IPv6:2001:da8:d800::8]) by mx1.freebsd.org (Postfix) with ESMTP id 7C528EBA for ; Sun, 22 Mar 2015 13:15:51 +0000 (UTC) Received: from freebsd (unknown [58.211.218.74]) by newmailweb.ustc.edu.cn (Coremail) with SMTP id LkAmygB3Jzx_wA5Vxm7DAw--.49545S2; Sun, 22 Mar 2015 21:15:48 +0800 (CST) Date: Sun, 22 Mar 2015 21:15:24 +0800 From: Tiwei Bie To: Konstantin Belousov Subject: Re: [PATCH] Finish the task 'Validate coredump format string' Message-ID: <20150322131524.GA95795@freebsd> References: <1426946345-67889-1-git-send-email-btw@mail.ustc.edu.cn> <20150321200500.GC14650@dft-labs.eu> <20150322091853.GA89976@freebsd> <20150322101401.GH14650@dft-labs.eu> <20150322112555.GA44277@freebsd> <20150322113822.GB2379@kib.kiev.ua> <20150322120655.GA59757@freebsd> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20150322120655.GA59757@freebsd> User-Agent: Mutt/1.5.23 (2014-03-12) X-CM-TRANSID: LkAmygB3Jzx_wA5Vxm7DAw--.49545S2 X-Coremail-Antispam: 1UD129KBjvJXoWxGFW5ZFWkCF4xJrWDuFW8Xrb_yoW5Ww4xpr WrCr95ArsakF43CFsav3yrZa4Yy3s5Jw4UW3y7XrsIkr1FgrykXr1rKr1FvF1kWrWvqr98 Jan8WFy7KrW7Z3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkYb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr1j6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwV C2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Gr0_Cr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcVAKI48JMxkIecxEwVAFwVW5GwCF04k20xvY 0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I 0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jrv_JF1lIxkGc2Ij64vIr41lIxAI cVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcV CF04k26cxKx2IYs7xG6rW3Jr0E3s1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280 aVCY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU0DUUUUUUUU== X-CM-SenderInfo: xewzqzxdloh3xvwfhvlgxou0/1tbiAQUQAVQhl-peFAAQsX Cc: freebsd-hackers@freebsd.org, Mateusz Guzik X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2015 13:15:53 -0000 On Sun, Mar 22, 2015 at 08:06:55PM +0800, Tiwei Bie wrote: > On Sun, Mar 22, 2015 at 01:38:22PM +0200, Konstantin Belousov wrote: > > On Sun, Mar 22, 2015 at 07:25:55PM +0800, Tiwei Bie wrote: > > > On Sun, Mar 22, 2015 at 11:14:01AM +0100, Mateusz Guzik wrote: > > > > On Sun, Mar 22, 2015 at 05:19:40PM +0800, Tiwei Bie wrote: > [..] > I will submit my new patch later. > Here is my new patch: --- sys/kern/kern_sig.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 64 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 8410d9d..5162ab6 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -3094,21 +3094,81 @@ static int compress_user_cores = 0; */ #define corefilename_lock allproc_lock -static char corefilename[MAXPATHLEN] = {"%N.core"}; +static char corefilename[MAXPATHLEN] = "%N.core"; + +static bool +corefilename_check(const char *format) +{ + int i, counti; + + counti = 0; + for (i = 0; i < MAXPATHLEN && format[i] != '\0'; i++) { + if (format[i] == '%') { + i++; + switch (format[i]) { + case 'I': + counti++; + if (counti > 1) + return (false); + case '%': + case 'H': + case 'N': + case 'P': + case 'U': + break; + default: + return (false); + } + } + } + + if (i == MAXPATHLEN) + return (false); + + return (true); +} + +static void +corefilename_init(void *arg) +{ + char *format; + + format = kern_getenv("kern.corefile"); + if (format != NULL && corefilename_check(format)) + strcpy(corefilename, format); +} +SYSINIT(corefilename, SI_SUB_KMEM, SI_ORDER_FIRST, corefilename_init, 0); static int sysctl_kern_corefile(SYSCTL_HANDLER_ARGS) { + char *format; int error; + format = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); + + sx_slock(&corefilename_lock); + strcpy(format, corefilename); + sx_sunlock(&corefilename_lock); + + error = sysctl_handle_string(oidp, format, MAXPATHLEN, req); + if (error || !req->newptr || strcmp(format, corefilename) == 0) + goto out; + + if (!corefilename_check(format)) { + error = EINVAL; + goto out; + } + sx_xlock(&corefilename_lock); - error = sysctl_handle_string(oidp, corefilename, sizeof(corefilename), - req); + strcpy(corefilename, format); sx_xunlock(&corefilename_lock); +out: + free(format, M_TEMP); return (error); } -SYSCTL_PROC(_kern, OID_AUTO, corefile, CTLTYPE_STRING | CTLFLAG_RWTUN | +SYSCTL_PROC(_kern, OID_AUTO, corefile, CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0, sysctl_kern_corefile, "A", "Process corefile name format string"); @@ -3170,11 +3230,6 @@ corefile_open(const char *comm, uid_t uid, pid_t pid, struct thread *td, case 'U': /* user id */ sbuf_printf(&sb, "%u", uid); break; - default: - log(LOG_ERR, - "Unknown format character %c in " - "corename `%s'\n", format[i], format); - break; } break; default: -- 2.1.2 Best regards, Tiwei Bie