From owner-p4-projects@FreeBSD.ORG Wed May 21 23:15:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10F661065672; Wed, 21 May 2008 23:15:40 +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 AF007106564A for ; Wed, 21 May 2008 23:15:39 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A06D58FC12 for ; Wed, 21 May 2008 23:15:39 +0000 (UTC) (envelope-from snagg@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4LNFdJO037457 for ; Wed, 21 May 2008 23:15:39 GMT (envelope-from snagg@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4LNFd6x037455 for perforce@freebsd.org; Wed, 21 May 2008 23:15:39 GMT (envelope-from snagg@FreeBSD.org) Date: Wed, 21 May 2008 23:15:39 GMT Message-Id: <200805212315.m4LNFd6x037455@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to snagg@FreeBSD.org using -f From: Vincenzo Iozzo To: Perforce Change Reviews Cc: Subject: PERFORCE change 141999 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: Wed, 21 May 2008 23:15:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=141999 Change 141999 by snagg@snagg_macosx on 2008/05/21 23:14:42 avoid a panic caused by a malloc WAITOK within a lock acquired. Some style fixes also Reviewed by: attilio Affected files ... .. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_pipe.c#15 edit Differences ... ==== //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_pipe.c#15 (text) ==== @@ -255,12 +255,10 @@ { struct audit_pipe_preselect *app; struct audit_pipe_preselect_event *event; - struct audit_pipe_preselect_event *ev_a; + struct audit_pipe_preselect_event ev_a; - ev_a = malloc(sizeof(struct audit_pipe_preselect_event), - M_AUDIT_PIPE_PRESELECT_EVENT, M_WAITOK); - ev_a->app_event = app_event; - ev_a->app_flag = event_flag; + ev_a.app_event = app_event; + ev_a.app_flag = event_flag; mtx_assert(&audit_pipe_mtx, MA_OWNED); @@ -268,9 +266,9 @@ if(app->app_pid == app_pid) { /* Just skip if we are interested only in the pid. */ if(app_event != -1) { - event = bsearch(ev_a, (app->app_auevents), app->app_event_len, - sizeof(struct audit_pipe_preselect_event), - audit_pipe_compare_preselect_event); + event = bsearch(&ev_a, (app->app_auevents), app->app_event_len, + sizeof(struct audit_pipe_preselect_event), + audit_pipe_compare_preselect_event); if(event != NULL) { if(event_flag != -1) if (event->app_flag != event_flag) @@ -280,7 +278,6 @@ } } } - free(ev_a, M_AUDIT_PIPE_PRESELECT_EVENT); return (app); } @@ -306,7 +303,7 @@ */ static int audit_pipe_preselect_get_events_list(struct audit_pipe *ap, - pid_t app_pid, struct audit_pipe_preselect_event *app_events) + pid_t app_pid, struct audit_pipe_preselect_event *app_events) { struct audit_pipe_preselect *app; int error; @@ -371,12 +368,15 @@ app = audit_pipe_preselect_find_event(ap, -1, app_pid, -1); found = (app != NULL) ? 1: 0; if(found) { - KASSERT(num <= app->app_event_len, ("Number of events is out of range")); + KASSERT(num <= app->app_event_len, + ("Number of events is out of range")); for (i = 0; i < num; i++) { (app->app_auevents + i)->app_event = (events + i)->app_event; (app->app_auevents + i)->app_flag = (events + i)->app_flag; } - qsort((app->app_auevents), app->app_event_len, sizeof(struct audit_pipe_preselect_event), audit_pipe_compare_preselect_event); + qsort((app->app_auevents), app->app_event_len, + sizeof(struct audit_pipe_preselect_event), + audit_pipe_compare_preselect_event); } else { app = app_new; app_new = NULL; @@ -386,7 +386,9 @@ (app->app_auevents + i)->app_event = (events + i)->app_event; (app->app_auevents + i)->app_flag = (events + i)->app_flag; } - qsort((app->app_auevents), app->app_event_len, sizeof(struct audit_pipe_preselect_event), audit_pipe_compare_preselect_event); + qsort((app->app_auevents), app->app_event_len, + sizeof(struct audit_pipe_preselect_event), + audit_pipe_compare_preselect_event); TAILQ_INSERT_TAIL(&ap->ap_preselect_list, app, app_list); }