[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 1/1] net/colo-compare.c: Fix memory leak in packet_enqueue()
From: |
Derek Su |
Subject: |
[PATCH v2 1/1] net/colo-compare.c: Fix memory leak in packet_enqueue() |
Date: |
Mon, 23 Mar 2020 01:47:51 +0800 |
The patch is to fix the "pkt" memory leak in packet_enqueue().
The allocated "pkt" needs to be freed if the colo compare
primary or secondary queue is too big.
Signed-off-by: Derek Su <address@hidden>
---
net/colo-compare.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 7ee17f2cf8..cdd87b2aa8 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -120,6 +120,10 @@ enum {
SECONDARY_IN,
};
+static const char *colo_mode[] = {
+ [PRIMARY_IN] = "primary",
+ [SECONDARY_IN] = "secondary",
+};
static int compare_chr_send(CompareState *s,
const uint8_t *buf,
@@ -215,6 +219,7 @@ static int packet_enqueue(CompareState *s, int mode,
Connection **con)
ConnectionKey key;
Packet *pkt = NULL;
Connection *conn;
+ int ret;
if (mode == PRIMARY_IN) {
pkt = packet_new(s->pri_rs.buf,
@@ -243,16 +248,18 @@ static int packet_enqueue(CompareState *s, int mode,
Connection **con)
}
if (mode == PRIMARY_IN) {
- if (!colo_insert_packet(&conn->primary_list, pkt, &conn->pack)) {
- error_report("colo compare primary queue size too big,"
- "drop packet");
- }
+ ret = colo_insert_packet(&conn->primary_list, pkt, &conn->pack);
} else {
- if (!colo_insert_packet(&conn->secondary_list, pkt, &conn->sack)) {
- error_report("colo compare secondary queue size too big,"
- "drop packet");
- }
+ ret = colo_insert_packet(&conn->secondary_list, pkt, &conn->sack);
}
+
+ if (!ret) {
+ error_report("colo compare %s queue size too big,"
+ "drop packet", colo_mode[mode]);
+ packet_destroy(pkt, NULL);
+ pkt = NULL;
+ }
+
*con = conn;
return 0;
--
2.17.1
- [PATCH v2 0/1] COLO: Fix memory leak in packet_enqueue(), Derek Su, 2020/03/22
- [PATCH v2 1/1] net/colo-compare.c: Fix memory leak in packet_enqueue(),
Derek Su <=
- RE: [PATCH v2 1/1] net/colo-compare.c: Fix memory leak in packet_enqueue(), Zhang, Chen, 2020/03/23
- Re: [PATCH v2 1/1] net/colo-compare.c: Fix memory leak in packet_enqueue(), Jing-Wei Su, 2020/03/23
- RE: [PATCH v2 1/1] net/colo-compare.c: Fix memory leak in packet_enqueue(), Zhang, Chen, 2020/03/24
- Re: [PATCH v2 1/1] net/colo-compare.c: Fix memory leak in packet_enqueue(), Jing-Wei Su, 2020/03/24
- Re: [PATCH v2 1/1] net/colo-compare.c: Fix memory leak in packet_enqueue(), Derek Su, 2020/03/25
- RE: [PATCH v2 1/1] net/colo-compare.c: Fix memory leak in packet_enqueue(), Zhang, Chen, 2020/03/25