net/802/mrp: fix vector attribute parsing in mrp_pdu_parse_vecattr

In mrp_pdu_parse_vecattr(), vector attribute events are encoded three
per byte and valen tracks the number of events left to process.

The parser decrements valen after processing the first and second events
from each event byte, but not after processing the third one. When valen
is exactly a multiple of three, the loop continues after the last valid
event and consumes the next byte as a new event byte, applying a
spurious event to the MRP applicant state.

Additionally, when valen is zero the parser unconditionally consumes
attrlen bytes as FirstValue and advances the offset, even though per
IEEE 802.1ak a VectorAttribute with only a LeaveAllEvent has valen of
zero and no FirstValue or Vector fields. This corrupts the offset for
subsequent PDU parsing.

Also, when valen exceeds three the loop crosses byte boundaries but
the attribute value is not incremented between the last event of one
byte and the first event of the next. This causes the first event of
the next byte to use the same attribute value as the third event
rather than the next consecutive value.

Decrement valen after processing the third event, skip FirstValue
consumption when valen is zero, and increment the attribute value at
the end of each loop iteration.

Fixes: febf018d2234 ("net/802: Implement Multiple Registration Protocol (MRP)")
Reported-by: Yizhou Zhao <zhaoyz24@mails.tsinghua.edu.cn>
Reported-by: Yuxiang Yang <yangyx22@mails.tsinghua.edu.cn>
Reported-by: Ao Wang <wangao@seu.edu.cn>
Reported-by: Xuewei Feng <fengxw06@126.com>
Reported-by: Qi Li <qli01@tsinghua.edu.cn>
Reported-by: Ke Xu <xuke@tsinghua.edu.cn>
Signed-off-by: Yizhou Zhao <zhaoyz24@mails.tsinghua.edu.cn>
Link: https://patch.msgid.link/20260603060016.21522-1-zhaoyz24@mails.tsinghua.edu.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/802/mrp.c b/net/802/mrp.c
index ff0e80574e6b7bebfdb994bfb995af07af09b1ba..160a3b14569cbddac2a4e5f16e871cdd0b11473b 100644 (file)
--- a/net/802/mrp.c
+++ b/net/802/mrp.c
@@ -703,6 +703,12 @@ static int mrp_pdu_parse_vecattr(struct mrp_applicant *app,
        valen = be16_to_cpu(get_unaligned(&mrp_cb(skb)->vah->lenflags) &
                            MRP_VECATTR_HDR_LEN_MASK);
 
+       /* If valen is 0, only a LeaveAllEvent is present; FirstValue and
+        * Vector fields are absent per IEEE 802.1ak.
+        */
+       if (valen == 0)
+               return 0;
+
        /* The VectorAttribute structure in a PDU carries event information
         * about one or more attributes having consecutive values. Only the
         * value for the first attribute is contained in the structure. So
@@ -753,6 +759,9 @@ static int mrp_pdu_parse_vecattr(struct mrp_applicant *app,
                vaevents %= __MRP_VECATTR_EVENT_MAX;
                vaevent = vaevents;
                mrp_pdu_parse_vecattr_event(app, skb, vaevent);
+               valen--;
+               mrp_attrvalue_inc(mrp_cb(skb)->attrvalue,
+                                 mrp_cb(skb)->mh->attrlen);
        }
        return 0;
 }