matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #18359 from soumyar-roy/soumya/streamsize

Browse source 
zebra: zebra crash for zapi stream
This commit is contained in:
Mark Stapp 2025-03-21 11:30:16 -04:00 committed by GitHub
parent 797e051222 860c1e4450
commit 556d3c445d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 146 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
lib/stream.c
View file

@ -16,6 +16,11 @@
#include "frr_pthread.h"
#include "lib_errors.h"
#define MIN_STREAM_EXPANSION_SZ 512
/* Extra size needed for a stream in bytes, given new write size */
#define STREAM_EXPAND_SIZE(S, WSZ) ((WSZ)-STREAM_WRITEABLE(S))
DEFINE_MTYPE_STATIC(LIB, STREAM, "Stream");
DEFINE_MTYPE_STATIC(LIB, STREAM_FIFO, "Stream FIFO");
@ -92,11 +97,20 @@ struct stream *stream_new(size_t size)
assert(size > 0);
s = XMALLOC(MTYPE_STREAM, sizeof(struct stream) + size);
s = XMALLOC(MTYPE_STREAM, sizeof(struct stream));
s->data = XMALLOC(MTYPE_STREAM, size);
s->getp = s->endp = 0;
s->next = NULL;
s->size = size;
s->allow_expansion = false;
return s;
}
struct stream *stream_new_expandable(size_t size)
{
struct stream *s = stream_new(size);
s->allow_expansion = true;
return s;
}
@ -106,6 +120,7 @@ void stream_free(struct stream *s)
if (!s)
return;
XFREE(MTYPE_STREAM, s->data);
XFREE(MTYPE_STREAM, s);
}
@ -115,7 +130,7 @@ struct stream *stream_copy(struct stream *dest, const struct stream *src)
assert(dest != NULL);
assert(STREAM_SIZE(dest) >= src->endp);
dest->allow_expansion = src->allow_expansion;
dest->endp = src->endp;
dest->getp = src->getp;
@ -131,7 +146,7 @@ struct stream *stream_dup(const struct stream *s)
STREAM_VERIFY_SANE(s);
snew = stream_new(s->endp);
snew->allow_expansion = s->allow_expansion;
return (stream_copy(snew, s));
}
@ -143,9 +158,16 @@ struct stream *stream_dupcat(const struct stream *s1, const struct stream *s2,
STREAM_VERIFY_SANE(s1);
STREAM_VERIFY_SANE(s2);
if (offset > s1->endp) {
fprintf(stderr, "Error: Invalid offset %zu, exceeds s1->endp %zu\n", offset,
s1->endp);
return NULL;
}
if ((new = stream_new(s1->endp + s2->endp)) == NULL)
return NULL;
new->allow_expansion = s1->allow_expansion || s2->allow_expansion;
memcpy(new->data, s1->data, offset);
memcpy(new->data + offset, s2->data, s2->endp);
memcpy(new->data + offset + s2->endp, s1->data + offset,
@ -160,7 +182,7 @@ size_t stream_resize_inplace(struct stream **sptr, size_t newsize)
STREAM_VERIFY_SANE(orig);
orig = XREALLOC(MTYPE_STREAM, orig, sizeof(struct stream) + newsize);
orig->data = XREALLOC(MTYPE_STREAM, orig->data, newsize);
orig->size = newsize;
@ -175,6 +197,29 @@ size_t stream_resize_inplace(struct stream **sptr, size_t newsize)
return orig->size;
}
/* Helper function to expand stream if needed and allowed */
static void stream_expand(struct stream *s, size_t expand_size)
{
size_t new_size;
size_t actual_expand_size = expand_size;
/* Growth strategy:
* For small expansions (<= min expansion bytes): grow by min size
* otherwise grow by needed size
*/
if (actual_expand_size <= MIN_STREAM_EXPANSION_SZ) {
actual_expand_size = MIN_STREAM_EXPANSION_SZ;
}
/* Calculate new total size */
new_size = s->size + actual_expand_size;
/* Reallocate the data buffer */
s->data = XREALLOC(MTYPE_STREAM, s->data, new_size);
/* Update the stream's data size */
s->size = new_size;
}
size_t stream_get_getp(const struct stream *s)
{
STREAM_VERIFY_SANE(s);
@ -691,9 +736,13 @@ void stream_put(struct stream *s, const void *src, size_t size)
STREAM_VERIFY_SANE(s);
if (STREAM_WRITEABLE(s) < size) {
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, size));
} else {
STREAM_BOUND_WARN(s, "put");
return;
}
}
if (src)
memcpy(s->data + s->endp, src, size);
@ -709,9 +758,13 @@ int stream_putc(struct stream *s, uint8_t c)
STREAM_VERIFY_SANE(s);
if (STREAM_WRITEABLE(s) < sizeof(uint8_t)) {
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, sizeof(uint8_t)));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
}
s->data[s->endp++] = c;
return sizeof(uint8_t);
@ -723,9 +776,13 @@ int stream_putw(struct stream *s, uint16_t w)
STREAM_VERIFY_SANE(s);
if (STREAM_WRITEABLE(s) < sizeof(uint16_t)) {
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, sizeof(uint16_t)));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
}
s->data[s->endp++] = (uint8_t)(w >> 8);
s->data[s->endp++] = (uint8_t)w;
@ -739,9 +796,13 @@ int stream_put3(struct stream *s, uint32_t l)
STREAM_VERIFY_SANE(s);
if (STREAM_WRITEABLE(s) < 3) {
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, 3));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
}
s->data[s->endp++] = (uint8_t)(l >> 16);
s->data[s->endp++] = (uint8_t)(l >> 8);
@ -756,9 +817,13 @@ int stream_putl(struct stream *s, uint32_t l)
STREAM_VERIFY_SANE(s);
if (STREAM_WRITEABLE(s) < sizeof(uint32_t)) {
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, sizeof(uint32_t)));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
}
s->data[s->endp++] = (uint8_t)(l >> 24);
s->data[s->endp++] = (uint8_t)(l >> 16);
@ -774,9 +839,13 @@ int stream_putq(struct stream *s, uint64_t q)
STREAM_VERIFY_SANE(s);
if (STREAM_WRITEABLE(s) < sizeof(uint64_t)) {
STREAM_BOUND_WARN(s, "put quad");
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, sizeof(uint64_t)));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
}
s->data[s->endp++] = (uint8_t)(q >> 56);
s->data[s->endp++] = (uint8_t)(q >> 48);
@ -896,9 +965,15 @@ int stream_put_ipv4(struct stream *s, uint32_t l)
STREAM_VERIFY_SANE(s);
if (STREAM_WRITEABLE(s) < sizeof(uint32_t)) {
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, sizeof(uint32_t)));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
return 0;
}
memcpy(s->data + s->endp, &l, sizeof(uint32_t));
s->endp += sizeof(uint32_t);
@ -911,9 +986,13 @@ int stream_put_in_addr(struct stream *s, const struct in_addr *addr)
STREAM_VERIFY_SANE(s);
if (STREAM_WRITEABLE(s) < sizeof(uint32_t)) {
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, sizeof(uint32_t)));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
}
memcpy(s->data + s->endp, addr, sizeof(uint32_t));
s->endp += sizeof(uint32_t);
@ -989,9 +1068,14 @@ int stream_put_prefix_addpath(struct stream *s, const struct prefix *p,
psize_with_addpath = psize;
if (STREAM_WRITEABLE(s) < (psize_with_addpath + sizeof(uint8_t))) {
if (s->allow_expansion) {
stream_expand(s,
STREAM_EXPAND_SIZE(s, psize_with_addpath + sizeof(uint8_t)));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
}
if (addpath_capable) {
s->data[s->endp++] = (uint8_t)(addpath_tx_id >> 24);
@ -1027,9 +1111,13 @@ int stream_put_labeled_prefix(struct stream *s, const struct prefix *p,
psize_with_addpath = psize + (addpath_capable ? 4 : 0);
if (STREAM_WRITEABLE(s) < (psize_with_addpath + 3)) {
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, psize_with_addpath + 3));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
}
if (addpath_capable) {
s->data[s->endp++] = (uint8_t)(addpath_tx_id >> 24);
@ -1167,9 +1255,13 @@ size_t stream_write(struct stream *s, const void *ptr, size_t size)
STREAM_VERIFY_SANE(s);
if (STREAM_WRITEABLE(s) < size) {
if (s->allow_expansion) {
stream_expand(s, STREAM_EXPAND_SIZE(s, size));
} else {
STREAM_BOUND_WARN(s, "put");
return 0;
}
}
memcpy(s->data + s->endp, ptr, size);
s->endp += size;

4
lib/stream.h
View file

@ -95,7 +95,8 @@ struct stream {
size_t getp; /* next get position */
size_t endp; /* last valid data position */
size_t size; /* size of data segment */
unsigned char data[]; /* data pointer */
bool allow_expansion; /* whether stream can be expanded */
unsigned char *data; /* data pointer */
};
/* First in first out queue structure. */
@ -132,6 +133,7 @@ struct stream_fifo {
* q: quad (four words)
*/
extern struct stream *stream_new(size_t);
extern struct stream *stream_new_expandable(size_t);
extern void stream_free(struct stream *);
/* Copy 'src' into 'dest', returns 'dest' */
extern struct stream *stream_copy(struct stream *dest,

18
lib/zclient.c
View file

@ -1326,24 +1326,6 @@ enum zclient_send_status zclient_nhg_send(struct zclient *zclient, int cmd,
return zclient_send_message(zclient);
}
/* size needed by a stream for redistributing a route */
int zapi_redistribute_stream_size(struct zapi_route *api)
{
size_t msg_size = 0;
size_t nh_size = sizeof(struct zapi_nexthop);
msg_size = sizeof(struct zapi_route);
/* remove unused nexthop structures */
msg_size -= (MULTIPATH_NUM - api->nexthop_num) * nh_size;
/* remove unused backup nexthop structures */
msg_size -= (MULTIPATH_NUM - api->backup_nexthop_num) * nh_size;
/* remove unused opaque values */
msg_size -= ZAPI_MESSAGE_OPAQUE_LENGTH - api->opaque.length;
return msg_size;
}
int zapi_route_encode(uint8_t cmd, struct stream *s, struct zapi_route *api)
{
struct zapi_nexthop *api_nh;

1
lib/zclient.h
View file

@ -1164,7 +1164,6 @@ zclient_send_rnh(struct zclient *zclient, int command, const struct prefix *p,
vrf_id_t vrf_id);
int zapi_nexthop_encode(struct stream *s, const struct zapi_nexthop *api_nh,
uint32_t api_flags, uint32_t api_message);
extern int zapi_redistribute_stream_size(struct zapi_route *api);
extern int zapi_route_encode(uint8_t, struct stream *, struct zapi_route *);
extern int zapi_route_decode(struct stream *s, struct zapi_route *api);
extern int zapi_nexthop_decode(struct stream *s, struct zapi_nexthop *api_nh,

5
tests/topotests/high_ecmp/test_high_ecmp_unnumbered.py
View file

@ -78,6 +78,10 @@ def setup_module(module):
(TopoRouter.RD_ZEBRA, "-s 180000000"),
(TopoRouter.RD_BGP, None),
(TopoRouter.RD_SHARP, None),
(TopoRouter.RD_STATIC, None),
(TopoRouter.RD_OSPF, None),
(TopoRouter.RD_OSPF6, None),
(TopoRouter.RD_PIM, None),
],
)
@ -86,6 +90,7 @@ def setup_module(module):
for rname, router in router_list.items():
router.cmd("vtysh -f {}/{}/frr_unnumbered_bgp.conf".format(CWD, rname))
def teardown_module(_mod):
"Teardown the pytest environment"
tgen = get_topogen()

5
tests/topotests/high_ecmp/test_high_ecmp_v4.py
View file

@ -78,6 +78,10 @@ def setup_module(module):
(TopoRouter.RD_ZEBRA, "-s 180000000"),
(TopoRouter.RD_BGP, None),
(TopoRouter.RD_SHARP, None),
(TopoRouter.RD_STATIC, None),
(TopoRouter.RD_OSPF, None),
(TopoRouter.RD_OSPF6, None),
(TopoRouter.RD_PIM, None),
],
)
@ -86,6 +90,7 @@ def setup_module(module):
for rname, router in router_list.items():
router.cmd("vtysh -f {}/{}/frr_ipv4_bgp.conf".format(CWD, rname))
def teardown_module(_mod):
"Teardown the pytest environment"
tgen = get_topogen()

5
tests/topotests/high_ecmp/test_high_ecmp_v6.py
View file

@ -78,6 +78,10 @@ def setup_module(module):
(TopoRouter.RD_ZEBRA, "-s 180000000"),
(TopoRouter.RD_BGP, None),
(TopoRouter.RD_SHARP, None),
(TopoRouter.RD_STATIC, None),
(TopoRouter.RD_OSPF, None),
(TopoRouter.RD_OSPF6, None),
(TopoRouter.RD_PIM, None),
],
)
@ -86,6 +90,7 @@ def setup_module(module):
for rname, router in router_list.items():
router.cmd("vtysh -f {}/{}/frr_ipv6_bgp.conf".format(CWD, rname))
def teardown_module(_mod):
"Teardown the pytest environment"
tgen = get_topogen()

4
zebra/zapi_msg.c
View file

@ -516,7 +516,6 @@ int zsend_redistribute_route(int cmd, struct zserv *client, const struct route_n
const struct prefix *p, *src_p;
uint16_t count = 0;
afi_t afi;
size_t stream_size = 0;
srcdest_rnode_prefixes(rn, &p, &src_p);
memset(&api, 0, sizeof(api));
@ -608,8 +607,7 @@ int zsend_redistribute_route(int cmd, struct zserv *client, const struct route_n
SET_FLAG(api.message, ZAPI_MESSAGE_MTU);
api.mtu = re->mtu;
stream_size = zapi_redistribute_stream_size(&api);
struct stream *s = stream_new(stream_size);
struct stream *s = stream_new_expandable(ZEBRA_MAX_PACKET_SIZ);
/* Encode route and send. */
if (zapi_route_encode(cmd, s, &api) < 0) {

2
zebra/zebra_rnh.c
View file

@ -1150,7 +1150,7 @@ int zebra_send_rnh_update(struct rnh *rnh, struct zserv *client,
re = rnh->state;
/* Get output stream. */
s = stream_new(ZEBRA_MAX_PACKET_SIZ);
s = stream_new_expandable(ZEBRA_MAX_PACKET_SIZ);
zclient_create_header(s, ZEBRA_NEXTHOP_UPDATE, vrf_id);