Mon Sep 5 14:13:50 2016 UTC ()

don't forget to destroy a cv


(christos)

diff -r1.70 -r1.71 src/sys/kern/sysv_msg.c

--- src/sys/kern/sysv_msg.c 2015/11/06 02:26:42	1.70
+++ src/sys/kern/sysv_msg.c 2016/09/05 14:13:50	1.71

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysv_msg.c,v 1.70 2015/11/06 02:26:42 pgoyette Exp $	*/
+/*	$NetBSD: sysv_msg.c,v 1.71 2016/09/05 14:13:50 christos Exp $	*/
 /*-
  * Copyright (c) 1999, 2006, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -40,27 +40,27 @@
  * This system call was implemented by Daniel Boulet under contract from RTMX.
+ *
  * Redistribution and use in source forms, with and without modification,
  * are permitted provided that this entire comment appears intact.
+ *
  * Redistribution in binary form may occur without any restrictions.
  * Obviously, it would be nice if you gave credit where credit is due
  * but requiring it would be too onerous.
+ *
  * This software is provided ``AS IS'' without any warranties of any kind.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysv_msg.c,v 1.70 2015/11/06 02:26:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysv_msg.c,v 1.71 2016/09/05 14:13:50 christos Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_sysv.h"
 #endif
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/msg.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>		/* XXX for <sys/syscallargs.h> */
 #include <sys/syscallargs.h>
 #include <sys/kauth.h>
 @@ -185,26 +185,27 @@ msgfini(void)
 /*
  * Destroy all condvars and free the memory we're using
  */
 	for (i = 0; i < msginfo.msgmni; i++) {
 		cv_destroy(&msqs[i].msq_cv);
+	}
 	sz = ALIGN(msginfo.msgmax) +
 	    ALIGN(msginfo.msgseg * sizeof(struct msgmap)) +
 	    ALIGN(msginfo.msgtql * sizeof(struct __msg)) +
 	    ALIGN(msginfo.msgmni * sizeof(kmsq_t));
 	sz = round_page(sz);
 	uvm_km_free(kernel_map, v, sz, UVM_KMF_WIRED);
 	cv_destroy(&msg_realloc_cv);
 	mutex_exit(&msgmutex);
 	mutex_destroy(&msgmutex);
 	kern_has_sysvmsg = 0;
 	return 0;
+}
 static int
 msgrealloc(int newmsgmni, int newmsgseg)
+{
 	struct msgmap *new_msgmaps;
 	struct __msg *new_msghdrs, *new_free_msghdrs;