diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-07-12 12:47:46 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2022-07-12 12:48:04 +0200 |
| commit | cefb7247f09b22480919d477f1577c490de936e7 (patch) | |
| tree | fab78ad93a68ab8046e51e9250444acf677f736a /pimd/pim_cmd.c | |
| parent | Merge pull request #11588 from opensourcerouting/fix/babeld_missing_routes (diff) | |
| download | frr-cefb7247f09b22480919d477f1577c490de936e7.tar.xz frr-cefb7247f09b22480919d477f1577c490de936e7.zip | |
pimd: fix unaligned accesses
These are in packed structs at weird offsets (e.g. 2 bytes), and as such
need a memcpy to get them into proper alignment.
It'd be even better if the pimd code used proper de/serialization, but
let's get this improved one step at a time.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 813ef4ca3..843b24efd 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -864,6 +864,7 @@ static void pim_show_bsm_db(struct pim_instance *pim, struct vty *vty, bool uj) struct bsmmsg_rpinfo *bsm_rpinfo; struct prefix grp; struct bsm_hdr *hdr; + pim_addr bsr_addr; uint32_t offset = 0; uint8_t *buf; uint32_t len = 0; @@ -877,15 +878,16 @@ static void pim_show_bsm_db(struct pim_instance *pim, struct vty *vty, bool uj) len -= PIM_MSG_HEADER_LEN; hdr = (struct bsm_hdr *)buf; + /* NB: bshdr->bsr_addr.addr is packed/unaligned => memcpy */ + memcpy(&bsr_addr, &hdr->bsr_addr.addr, sizeof(bsr_addr)); /* BSM starts with bsr header */ buf += sizeof(struct bsm_hdr); len -= sizeof(struct bsm_hdr); if (uj) { - json_object_string_addf( - json, "BSR address", "%pPA", - (pim_addr *)&hdr->bsr_addr.addr); + json_object_string_addf(json, "BSR address", "%pPA", + &bsr_addr); json_object_int_add(json, "BSR priority", hdr->bsr_prio); json_object_int_add(json, "Hashmask Length", @@ -897,9 +899,9 @@ static void pim_show_bsm_db(struct pim_instance *pim, struct vty *vty, bool uj) vty_out(vty, "------------------\n"); vty_out(vty, "%-15s %-15s %-15s %-15s\n", "BSR-Address", "BSR-Priority", "Hashmask-len", "Fragment-Tag"); - vty_out(vty, "%-15pPA %-15d %-15d %-15d\n", - (pim_addr *)&hdr->bsr_addr.addr, hdr->bsr_prio, - hdr->hm_len, ntohs(hdr->frag_tag)); + vty_out(vty, "%-15pPA %-15d %-15d %-15d\n", &bsr_addr, + hdr->bsr_prio, hdr->hm_len, + ntohs(hdr->frag_tag)); } vty_out(vty, "\n"); @@ -957,7 +959,12 @@ static void pim_show_bsm_db(struct pim_instance *pim, struct vty *vty, bool uj) "RpAddress HoldTime Priority\n"); while (frag_rp_cnt--) { + pim_addr rp_addr; + bsm_rpinfo = (struct bsmmsg_rpinfo *)buf; + /* unaligned, again */ + memcpy(&rp_addr, &bsm_rpinfo->rpaddr, + sizeof(rp_addr)); buf += sizeof(struct bsmmsg_rpinfo); offset += sizeof(struct bsmmsg_rpinfo); @@ -966,8 +973,7 @@ static void pim_show_bsm_db(struct pim_instance *pim, struct vty *vty, bool uj) json_row = json_object_new_object(); json_object_string_addf( json_row, "Rp Address", "%pPA", - (pim_addr *)&bsm_rpinfo->rpaddr - .addr); + &rp_addr); json_object_int_add( json_row, "Rp HoldTime", ntohs(bsm_rpinfo->rp_holdtime)); @@ -976,12 +982,10 @@ static void pim_show_bsm_db(struct pim_instance *pim, struct vty *vty, bool uj) bsm_rpinfo->rp_pri); json_object_object_addf( json_group, json_row, "%pPA", - (pim_addr *)&bsm_rpinfo->rpaddr - .addr); + &rp_addr); } else { vty_out(vty, "%-15pPA %-12d %d\n", - (pim_addr *)&bsm_rpinfo->rpaddr - .addr, + &rp_addr, ntohs(bsm_rpinfo->rp_holdtime), bsm_rpinfo->rp_pri); } |