From nobody Tue Jan 16 14:29:19 2024 X-Original-To: bugs@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TDrxD10xtz57Knw for ; Tue, 16 Jan 2024 14:29:20 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TDrxC4SS6z4GFS for ; Tue, 16 Jan 2024 14:29:19 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705415359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fdxLQc6FpEdtD4f9UavFfRXk+jJheK7b8Sac2gm59U8=; b=pHTrEVQyVN8Rmks0KAVz9L6VP2+8vx3L8RnYTB7ezVQVJff6v07nOkXtHA5jcMXXHEmRC4 oAGGTbYgDiItgrh3wPT9bkkqjIHpX1sGI5hb7X4IovV3RWVwkx+ddCBIFrldYoBv8HuO56 kxGLjXaFzOMlFz72ZlDXskma5Bz6sVYrh5I+vpAexgwNF1f6V0GsP/GWA+y/pIRcQ/80t2 TZVspYvc/5fxUG3KsUGtcIN/gcMNZIw+E5x6ui/ONzNYs3AEGDy/zBnjCe+E8np98eSoGW P8ytlaEEK9uHg1on7bPeoHawe+xQmZqIOQST7vbgd+2TQRmKPMfoKWDfwDTrVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705415359; a=rsa-sha256; cv=none; b=qK5Z68ysYZ/CHyoNiYMrNZj6+Espts5Z61Yv4xjtrc3uWiMqwvw0fkYSr61G2tJPPG1otv QyoaqBQogf+kffHjHKphxMdC7IMzPiXIuTT4r8e1m8ozDosSLNDDJWB+8EkczgnnjusNb7 bwQVHLNGtk2dAE0w5veUj8EnVtrP0G+ZoHPyyDvHcBjmz+msMpFZmTo7RQuz4jukLztJfB lB1qWW9VsVm8hsLsNkSNu608Lfc7FWCCYucYK2qhREIzpYFElqW+vGHc3fQl2xyJub9RTQ ZizNXvsEYCoiNcdWj10//TI3OAmYyRyqdMNPvp1dcIWx0Qv7G/ixleraUSeu7g== Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TDrxC0p8MzkWv for ; Tue, 16 Jan 2024 14:29:19 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 40GETJHb053415 for ; Tue, 16 Jan 2024 14:29:19 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 40GETJsM053414 for bugs@FreeBSD.org; Tue, 16 Jan 2024 14:29:19 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 276363] if_wg: Fix a code bug in calculate_padding() although impossible to hit Date: Tue, 16 Jan 2024 14:29:19 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: kern X-Bugzilla-Version: CURRENT X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Some People X-Bugzilla-Who: aly@aaronly.me X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-bugs@freebsd.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D276363 --- Comment #1 from Aaron LI --- Well, after testing, I found 'pkt->p_mtu' is actually 0 for keepalive packe= ts; however, those packets also have a zero length, so calculate_padding() didn= 't cause any real problems. I suggest the following new patch: --- if_wg.c.orig 2023-10-12 09:06:16.983637264 +0800 +++ if_wg.c 2024-01-16 22:25:04.878629478 +0800 @@ -1461,8 +1461,11 @@ calculate_padding(struct wg_packet *pkt) { unsigned int padded_size, last_unit =3D pkt->p_mbuf->m_pkthdr.len; - if (__predict_false(!pkt->p_mtu)) - return (last_unit + (WG_PKT_PADDING - 1)) & ~(WG_PKT_PADDIN= G - 1); + /* Keepalive packets don't set p_mtu, but also have a zreo length. = */ + if (__predict_false(pkt->p_mtu =3D=3D 0)) { + padded_size =3D (last_unit + (WG_PKT_PADDING - 1)) & ~(WG_PKT_PADDING - 1); + return padded_size - last_unit; + } if (__predict_false(last_unit > pkt->p_mtu)) last_unit %=3D pkt->p_mtu; --=20 You are receiving this mail because: You are the assignee for the bug.=