|
 |
e7a346 |
From f6b4b4308b838b29f17b2a4a54385269991f0118 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Mohit Agrawal <moagrawal@redhat.com>
|
|
|
e7a346 |
Date: Thu, 5 Jul 2018 15:02:06 +0530
|
|
|
e7a346 |
Subject: [PATCH 315/325] changelog: fix br-state-check.t crash for brick_mux
|
|
|
e7a346 |
|
|
|
e7a346 |
Problem: br-state-check.t is getting crash
|
|
|
e7a346 |
|
|
|
e7a346 |
Solution: Check condition in rpcsvc_request_create
|
|
|
e7a346 |
before allocate memory from rxpool
|
|
|
e7a346 |
|
|
|
e7a346 |
> BUG: 1597776
|
|
|
e7a346 |
> Change-Id: I4fde1ade6073f603c32453f1840395db9a9155b7
|
|
|
e7a346 |
> fixes: bz#1597776
|
|
|
e7a346 |
> (cherry picked from commit e31c7a7c0c1ea3f6e931935226fb976a92779ba7)
|
|
|
e7a346 |
> (Reviewed on upstream link https://review.gluster.org/#/c/20132/)
|
|
|
e7a346 |
|
|
|
e7a346 |
BUG: 1597768
|
|
|
e7a346 |
Change-Id: I3a0dc8f9625a6ab9ce8364119413ae45e321e620
|
|
|
e7a346 |
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/143719
|
|
|
e7a346 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
e7a346 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
rpc/rpc-lib/src/rpcsvc.c | 5 +++--
|
|
|
e7a346 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
|
|
|
e7a346 |
index 3acaa8b..8d0c409 100644
|
|
|
e7a346 |
--- a/rpc/rpc-lib/src/rpcsvc.c
|
|
|
e7a346 |
+++ b/rpc/rpc-lib/src/rpcsvc.c
|
|
|
e7a346 |
@@ -447,7 +447,7 @@ rpcsvc_request_create (rpcsvc_t *svc, rpc_transport_t *trans,
|
|
|
e7a346 |
size_t msglen = 0;
|
|
|
e7a346 |
int ret = -1;
|
|
|
e7a346 |
|
|
|
e7a346 |
- if (!svc || !trans)
|
|
|
e7a346 |
+ if (!svc || !trans || !svc->rxpool)
|
|
|
e7a346 |
return NULL;
|
|
|
e7a346 |
|
|
|
e7a346 |
/* We need to allocate the request before actually calling
|
|
|
e7a346 |
@@ -1473,6 +1473,7 @@ rpcsvc_get_listener (rpcsvc_t *svc, uint16_t port, rpc_transport_t *trans)
|
|
|
e7a346 |
{
|
|
|
e7a346 |
rpcsvc_listener_t *listener = NULL;
|
|
|
e7a346 |
char found = 0;
|
|
|
e7a346 |
+ rpcsvc_listener_t *next = NULL;
|
|
|
e7a346 |
uint32_t listener_port = 0;
|
|
|
e7a346 |
|
|
|
e7a346 |
if (!svc) {
|
|
|
e7a346 |
@@ -1481,7 +1482,7 @@ rpcsvc_get_listener (rpcsvc_t *svc, uint16_t port, rpc_transport_t *trans)
|
|
|
e7a346 |
|
|
|
e7a346 |
pthread_mutex_lock (&svc->rpclock);
|
|
|
e7a346 |
{
|
|
|
e7a346 |
- list_for_each_entry (listener, &svc->listeners, list) {
|
|
|
e7a346 |
+ list_for_each_entry_safe (listener, next, &svc->listeners, list) {
|
|
|
e7a346 |
if (listener && trans) {
|
|
|
e7a346 |
if (listener->trans == trans) {
|
|
|
e7a346 |
found = 1;
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|