diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2023-09-07 10:09:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-07 10:09:37 +0300 |
| commit | f3434880b6768b1d1059a578d2c404490a56004f (patch) | |
| tree | 97bc136e5e734c3277aff56bf4316afe4b7205a9 | |
| parent | 500aa8f0396626ac421fa21e0acd8edc41bab517 (diff) | |
| parent | 2b9373c114dfc0154f6291474789f44256358518 (diff) | |
Merge pull request #14358 from donaldsharp/tc_possible_crash
zebra: Prevent Null pointer deref
| -rw-r--r-- | zebra/tc_netlink.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/zebra/tc_netlink.c b/zebra/tc_netlink.c index 679dc80a58..d0f4ed6d18 100644 --- a/zebra/tc_netlink.c +++ b/zebra/tc_netlink.c @@ -703,6 +703,8 @@ int netlink_qdisc_change(struct nlmsghdr *h, ns_id_t ns_id, int startup) { struct tcmsg *tcm; struct zebra_tc_qdisc qdisc = {}; + enum tc_qdisc_kind kind = TC_QDISC_UNSPEC; + const char *kind_str = "Unknown"; int len; struct rtattr *tb[TCA_MAX + 1]; @@ -722,9 +724,11 @@ int netlink_qdisc_change(struct nlmsghdr *h, ns_id_t ns_id, int startup) tcm = NLMSG_DATA(h); netlink_parse_rtattr(tb, TCA_MAX, TCA_RTA(tcm), len); - const char *kind_str = (const char *)RTA_DATA(tb[TCA_KIND]); + if (RTA_DATA(tb[TCA_KIND])) { + kind_str = (const char *)RTA_DATA(tb[TCA_KIND]); - enum tc_qdisc_kind kind = tc_qdisc_str2kind(kind_str); + kind = tc_qdisc_str2kind(kind_str); + } qdisc.qdisc.ifindex = tcm->tcm_ifindex; |