The following reply was made to PR kern/162174; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: kern/162174: commit references a PR Date: Thu, 31 May 2012 17:27:19 +0000 (UTC) Author: imp Date: Thu May 31 17:27:05 2012 New Revision: 236359 URL: http://svn.freebsd.org/changeset/base/236359 Log: Unlock in the error path to prevent a lock leak. PR: 162174 Submitted by: Ian Lepore MFC after: 2 weeks Modified: head/sys/kern/subr_rman.c Modified: head/sys/kern/subr_rman.c ============================================================================== --- head/sys/kern/subr_rman.c Thu May 31 14:47:02 2012 (r236358) +++ head/sys/kern/subr_rman.c Thu May 31 17:27:05 2012 (r236359) @@ -161,6 +161,7 @@ int rman_manage_region(struct rman *rm, u_long start, u_long end) { struct resource_i *r, *s, *t; + int rv = 0; DPRINTF(("rman_manage_region: <%s> request: start %#lx, end %#lx\n", rm->rm_descr, start, end)); @@ -188,13 +189,17 @@ rman_manage_region(struct rman *rm, u_lo TAILQ_INSERT_TAIL(&rm->rm_list, r, r_link); } else { /* Check for any overlap with the current region. */ - if (r->r_start <= s->r_end && r->r_end >= s->r_start) - return EBUSY; + if (r->r_start <= s->r_end && r->r_end >= s->r_start) { + rv = EBUSY; + goto out; + } /* Check for any overlap with the next region. */ t = TAILQ_NEXT(s, r_link); - if (t && r->r_start <= t->r_end && r->r_end >= t->r_start) - return EBUSY; + if (t && r->r_start <= t->r_end && r->r_end >= t->r_start) { + rv = EBUSY; + goto out; + } /* * See if this region can be merged with the next region. If @@ -225,9 +230,9 @@ rman_manage_region(struct rman *rm, u_lo TAILQ_INSERT_BEFORE(s, r, r_link); } } - +out: mtx_unlock(rm->rm_mtx); - return 0; + return rv; } int _______________________________________________ svn-src-...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org" _______________________________________________ freebsd-bugs@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-bugs To unsubscribe, send any mail to "freebsd-bugs-unsubscr...@freebsd.org"
