From owner-p4-projects@FreeBSD.ORG Mon Aug 10 10:01:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E4121065670; Mon, 10 Aug 2009 10:01:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5EBE1106566B for ; Mon, 10 Aug 2009 10:01:54 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3488E8FC23 for ; Mon, 10 Aug 2009 10:01:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7AA1s30004307 for ; Mon, 10 Aug 2009 10:01:54 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7AA1seE004305 for perforce@freebsd.org; Mon, 10 Aug 2009 10:01:54 GMT (envelope-from trasz@freebsd.org) Date: Mon, 10 Aug 2009 10:01:54 GMT Message-Id: <200908101001.n7AA1seE004305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 167164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Aug 2009 10:01:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=167164 Change 167164 by trasz@trasz_anger on 2009/08/10 10:01:38 Fix two LORs. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#51 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#22 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#51 (text+ko) ==== @@ -57,6 +57,7 @@ /* Default buffer size for hrl_get_rules(2). */ #define HRL_DEFAULT_BUFSIZE 4096 +#define HRL_LOG_BUFSIZE 128 int hrl_group_accounting = 0; @@ -329,8 +330,9 @@ int64_t available[HRL_RESOURCE_MAX]; struct hrl_rule *rule; struct hrl_limit *limit; - struct sbuf *sb; + struct sbuf sb; int should_deny = 0; + char *buf; mtx_assert(&hrl_lock, MA_OWNED); @@ -368,13 +370,19 @@ should_deny = 1; break; case HRL_ACTION_LOG: - sb = sbuf_new_auto(); - hrl_rule_to_sbuf(sb, rule); - sbuf_finish(sb); + buf = malloc(HRL_LOG_BUFSIZE, M_HRL, M_NOWAIT); + if (buf == NULL) { + printf("hrl_enforce_proc: out of memory\n"); + continue; + } + sbuf_new(&sb, buf, HRL_LOG_BUFSIZE, SBUF_FIXEDLEN); + hrl_rule_to_sbuf(&sb, rule); + sbuf_finish(&sb); printf("resource limit \"%s\" exceeded by process %d (%s), " - "uid %d\n", sbuf_data(sb), p->p_pid, p->p_comm, + "uid %d\n", sbuf_data(&sb), p->p_pid, p->p_comm, p->p_ucred->cr_uid); - sbuf_delete(sb); + sbuf_delete(&sb); + free(buf, M_HRL); break; case HRL_ACTION_SIGHUP: hrl_deferred_psignal(p, SIGHUP); @@ -1493,17 +1501,18 @@ return (EOPNOTSUPP); } - p = pfind(filter->hr_subject_id); - if (p == NULL) { - hrl_rule_release(filter); - return (ESRCH); - } - again: buf = malloc(bufsize, M_HRL, M_WAITOK); sb = sbuf_new(NULL, buf, bufsize, SBUF_FIXEDLEN); KASSERT(sb != NULL, ("sbuf_new failed")); + p = pfind(filter->hr_subject_id); + if (p == NULL) { + sbuf_delete(sb); + error = ESRCH; + goto out; + } + mtx_lock(&hrl_lock); LIST_FOREACH(limit, &p->p_limits, hl_next) { hrl_rule_to_sbuf(sb, limit->hl_rule); @@ -1525,6 +1534,7 @@ sbuf_setpos(sb, sbuf_len(sb) - 1); error = hrl_write_outbuf(sb, uap->outbufp, uap->outbuflen); +out: hrl_rule_release(filter); free(buf, M_HRL); return (error); ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#22 (text+ko) ====