Module Name: src
Committed By: knakahara
Date: Thu Oct 6 06:59:25 UTC 2022
Modified Files:
src/sys/net: if_ipsec.c
Log Message:
Fix overflow case detected by clang. Pointed out by wsh@IIJ, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/net/if_ipsec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.32 src/sys/net/if_ipsec.c:1.33
--- src/sys/net/if_ipsec.c:1.32 Fri Sep 30 07:36:36 2022
+++ src/sys/net/if_ipsec.c Thu Oct 6 06:59:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipsec.c,v 1.32 2022/09/30 07:36:36 knakahara Exp $ */
+/* $NetBSD: if_ipsec.c,v 1.33 2022/10/06 06:59:24 knakahara Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.32 2022/09/30 07:36:36 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.33 2022/10/06 06:59:24 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1798,12 +1798,12 @@ if_ipsec_get_reqids(struct ipsec_variant
mutex_enter(&ipsec_softcs.lock);
if (ipsec_softcs.use_fixed_reqid) {
- u_int16_t reqid_base;
+ uint32_t reqid_base;
reqid_base = ipsec_softcs.reqid_base + ifp->if_index * 2;
if (reqid_base + 1 > ipsec_softcs.reqid_last) {
log(LOG_ERR,
- "%s: invalid fixed reqid(%"PRIu16"), "
+ "%s: invalid fixed reqid(%"PRIu32"), "
"current range %"PRIu16" <= reqid <= %"PRIu16"\n",
ifp->if_xname, reqid_base + 1,
ipsec_softcs.reqid_base, ipsec_softcs.reqid_last);
