git: 39917ef2a85f - stable/12 - ng_parse: IP address parsing in netgraph eating too many characters

[Lutz Donnerhacke]

The branch stable/12 has been updated by donner:

URL: https://cgit.FreeBSD.org/src/commit/?id=39917ef2a85fa92a641bd6be346068f6097c8e98

commit 39917ef2a85fa92a641bd6be346068f6097c8e98
Author:     Markus Stoff <markus at stoffdv.at>
AuthorDate: 2021-05-18 20:35:33 +0000
Commit:     Lutz Donnerhacke <donner at FreeBSD.org>
CommitDate: 2021-06-08 10:23:49 +0000

    ng_parse: IP address parsing in netgraph eating too many characters
    
    Once the final component of the IP address has been parsed, the offset
    on the input must not be advanced, as this would remove an unparsed
    character from the input.
    
    Submitted by:   Markus Stoff
    Reviewed by:    donner
    Differential Revision: https://reviews.freebsd.org/D26489
    
    (cherry picked from commit 63b6a08ce2467b8e230e7a4ecb3e1ddf1b48851c)
---
 sys/netgraph/ng_parse.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys/netgraph/ng_parse.c b/sys/netgraph/ng_parse.c
index b08cecd102e9..7297756c796d 100644
--- a/sys/netgraph/ng_parse.c
+++ b/sys/netgraph/ng_parse.c
@@ -961,9 +961,11 @@ ng_ipaddr_parse(const struct ng_parse_type *type,
 		if ((error = ng_int8_parse(&ng_parse_int8_type,
 		    s, off, start, buf + i, buflen)) != 0)
 			return (error);
-		if (i < 3 && s[*off] != '.')
-			return (EINVAL);
-		(*off)++;
+		if (i < 3) {
+			if (s[*off] != '.')
+				return (EINVAL);
+			(*off)++;
+		}
 	}
 	*buflen = 4;
 	return (0);