1From 5436cafe1d7df409a44ff5f610248db57f0677ee Mon Sep 17 00:00:00 2001
2From: Hitendra Prajapati <hprajapati@mvista.com>
3Date: Mon, 10 Oct 2022 09:58:04 +0530
4Subject: [PATCH 2/2] CVE-2022-2929
5
6Upstream-Status: Backport [https://downloads.isc.org/isc/dhcp/4.4.3-P1/patches/]
7CVE: CVE-2022-2929
8Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
9---
10 common/options.c | 8 ++++----
11 1 file changed, 4 insertions(+), 4 deletions(-)
12
13diff --git a/common/options.c b/common/options.c
14index f0959cb..25450e1 100644
15--- a/common/options.c
16+++ b/common/options.c
17@@ -454,16 +454,16 @@ int fqdn_universe_decode (struct option_state *options,
18 		while (s < &bp -> data[0] + length + 2) {
19 			len = *s;
20 			if (len > 63) {
21-				log_info ("fancy bits in fqdn option");
22-				return 0;
23+				log_info ("label length exceeds 63 in fqdn option");
24+				goto bad;
25 			}
26 			if (len == 0) {
27 				terminated = 1;
28 				break;
29 			}
30 			if (s + len > &bp -> data [0] + length + 3) {
31-				log_info ("fqdn tag longer than buffer");
32-				return 0;
33+				log_info ("fqdn label longer than buffer");
34+				goto bad;
35 			}
36
37 			if (first_len == 0) {
38--
392.25.1
40
41