51 lines
1.3 KiB
Diff
51 lines
1.3 KiB
Diff
--- sys/kern/uipc_mqueue.c.orig
|
|
+++ sys/kern/uipc_mqueue.c
|
|
@@ -2283,13 +2283,14 @@
|
|
if (uap->abs_timeout != NULL) {
|
|
error = copyin(uap->abs_timeout, &ets, sizeof(ets));
|
|
if (error != 0)
|
|
- return (error);
|
|
+ goto out;
|
|
abs_timeout = &ets;
|
|
} else
|
|
abs_timeout = NULL;
|
|
waitok = !(fp->f_flag & O_NONBLOCK);
|
|
error = mqueue_receive(mq, uap->msg_ptr, uap->msg_len,
|
|
uap->msg_prio, waitok, abs_timeout);
|
|
+out:
|
|
fdrop(fp, td);
|
|
return (error);
|
|
}
|
|
@@ -2309,13 +2310,14 @@
|
|
if (uap->abs_timeout != NULL) {
|
|
error = copyin(uap->abs_timeout, &ets, sizeof(ets));
|
|
if (error != 0)
|
|
- return (error);
|
|
+ goto out;
|
|
abs_timeout = &ets;
|
|
} else
|
|
abs_timeout = NULL;
|
|
waitok = !(fp->f_flag & O_NONBLOCK);
|
|
error = mqueue_send(mq, uap->msg_ptr, uap->msg_len,
|
|
uap->msg_prio, waitok, abs_timeout);
|
|
+out:
|
|
fdrop(fp, td);
|
|
return (error);
|
|
}
|
|
@@ -2834,7 +2836,7 @@
|
|
if (uap->abs_timeout != NULL) {
|
|
error = copyin(uap->abs_timeout, &ets32, sizeof(ets32));
|
|
if (error != 0)
|
|
- return (error);
|
|
+ goto out;
|
|
CP(ets32, ets, tv_sec);
|
|
CP(ets32, ets, tv_nsec);
|
|
abs_timeout = &ets;
|
|
@@ -2843,6 +2845,7 @@
|
|
waitok = !(fp->f_flag & O_NONBLOCK);
|
|
error = mqueue_receive(mq, uap->msg_ptr, uap->msg_len,
|
|
uap->msg_prio, waitok, abs_timeout);
|
|
+out:
|
|
fdrop(fp, td);
|
|
return (error);
|
|
}
|