diff options
| author | Dan McDonald <danmcd@joyent.com> | 2019-01-16 11:42:24 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-01-16 19:18:08 -0500 |
| commit | 30705f8dce180a0882752e20319b9186ebd10aa3 (patch) | |
| tree | 867e17b70232c371e045d8dae54a57bad892648e | |
| parent | b02dac51d4252de91533d0834f97c39491cc8108 (diff) | |
| download | illumos-joyent-release-20190117.tar.gz | |
OS-7516 so_krecv_unblock() double-mutex-exitsrelease-20190117
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Jason King <jbk@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/uts/common/fs/sockfs/sockcommon_subr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/uts/common/fs/sockfs/sockcommon_subr.c b/usr/src/uts/common/fs/sockfs/sockcommon_subr.c index 7bdd64393b..df159a122c 100644 --- a/usr/src/uts/common/fs/sockfs/sockcommon_subr.c +++ b/usr/src/uts/common/fs/sockfs/sockcommon_subr.c @@ -24,7 +24,7 @@ */ /* * Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved. - * Copyright 2015 Joyent, Inc. + * Copyright 2019 Joyent, Inc. */ #include <sys/types.h> @@ -2517,5 +2517,8 @@ so_krecv_unblock(sonode_t *so) so->so_rcv_queued = 0; (void) so_check_flow_control(so); - mutex_exit(&so->so_lock); + /* + * so_check_flow_control() always drops so->so_lock, so we won't + * need to drop it ourselves. + */ } |