From nobody Tue Nov 28 04:12:40 2023 X-Original-To: dev-commits-src-all@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 4SfTZJ3lYhz52cxj; Tue, 28 Nov 2023 04:12:40 +0000 (UTC) (envelope-from git@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 4SfTZJ3Bp1z4RB3; Tue, 28 Nov 2023 04:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701144760; 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; bh=+iZQqfe+GrXxrd9NhomEs2DMCdg+hYukzZ9f1XWsNHQ=; b=e8rOtwGjbuCtxoaSIZ2+ZZtjZp94icaEow1AiYiy8+4BVqTvWwfmRJkZ410IxsXKZmLgoY HiOoqSVDF1Lr5NBiAYrrT2hOmBcrAoZ4hhWA97bKKWJ9xDgBeL20xHzqQBRGgVGlP09VNu KJ6zbkXAccvxFHBZ7XMgx8+TCKOJIpEqJF42KQKv/y93eRT3c3n7KrbuHeKxFhhilYbpDI tZoFvxysw5P1lnmEVSwrvMfvp69IQpeYGiFhf30DTbkuSPh+7gl//Hm0D1yLYU6JBlya1h KNhWA1t+DvOpb9rCsOFIUmnJ3/s3oont5YVCiKd78POEKC4qmTumI9+YApqLfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701144760; 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; bh=+iZQqfe+GrXxrd9NhomEs2DMCdg+hYukzZ9f1XWsNHQ=; b=wK7K2N5BxS3RKdKSkZHY44CFmUbUnydu2+ztJuKs8gCps2PVSxuEFPfGxZd+4SoAr/2kaP 9wzlezcs7uQ63TITbWD5wAcxeqfqxztWBTim0yRpmojgUOUyiVgHgmu/Xla21Iy2HQ/6y2 NX91CD5H1sw0YUOJUbSH1tTjLtjXPijs8PTvRFnyBEnH9eGaYSytwdq+pNnFhlo2+LNlkE jFgihQO8bockzdYZq17Fs479EMGBpvLnTe05d9IROaKvzxBt9nFBmfL8m1bmz+7SQhioaN ErZRyXOo49UT/BwJJ05eWR5jyQ5cqmQZ+/EQu+vGRg6uowdrWFNVlo0dYlf5Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701144760; a=rsa-sha256; cv=none; b=H2DQskr8sxqhoOJwGi0qF4POush31z90a0kAF7BtDnR5v29GLmyUlF6m9DLD9hEw9mP1fI +Fu5m0vrju7oD+xpem/6OBCf1Ed0ACDwyut90e5+jKw1Dyl56+tfM9dkZqm0fTItRvt3AX 6Yv7C+Nf+noA3E/D+9utxvI0+ERlONaptEKvttHwUTU9wubvrbHT+jKnoYhK/9tL7Rusw6 Y6q6jUSABa5Ezu1r/kLc2vFN2UuBP/aJQu9/zP8bMfh2Vz0p7IWPmXzdxMogHyBXzIzADv rRu6iyu2T/2DRF/kT0Ff3y9P7Zl+TkkxNu2yrwt0rLBRTeYA5HcPXXkakKylcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 4SfTZJ2GM5z167s; Tue, 28 Nov 2023 04:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AS4Ce1K087211; Tue, 28 Nov 2023 04:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS4Ce5a087208; Tue, 28 Nov 2023 04:12:40 GMT (envelope-from git) Date: Tue, 28 Nov 2023 04:12:40 GMT Message-Id: <202311280412.3AS4Ce5a087208@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 4064a1108b51 - main - netgraph: increase size of sockaddr_ng to match maximum node name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4064a1108b51b24903c8d67db21e8dbaf89b475f Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4064a1108b51b24903c8d67db21e8dbaf89b475f commit 4064a1108b51b24903c8d67db21e8dbaf89b475f Author: Gleb Smirnoff AuthorDate: 2023-11-28 04:10:52 +0000 Commit: Gleb Smirnoff CommitDate: 2023-11-28 04:10:52 +0000 netgraph: increase size of sockaddr_ng to match maximum node name The ng_socket(4) node already writes more than declared size of the struct at least in the in ng_getsockaddr(). Make size match size of a node name. The value is pasted instead of including ng_message.h into ng_socket.h. This is external API and we want to keep it stable even if NG_NODESIZ is redefined in a kernel build. Reviewed by: afedorov Differential Revision: https://reviews.freebsd.org/D42690 --- sys/netgraph/ng_message.h | 5 ++++- sys/netgraph/ng_socket.h | 2 +- tests/sys/netgraph/socket.c | 5 ----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sys/netgraph/ng_message.h b/sys/netgraph/ng_message.h index 46659bc4cec5..45556ecc609c 100644 --- a/sys/netgraph/ng_message.h +++ b/sys/netgraph/ng_message.h @@ -42,7 +42,10 @@ #ifndef _NETGRAPH_NG_MESSAGE_H_ #define _NETGRAPH_NG_MESSAGE_H_ -/* ASCII string size limits */ +/* + * ASCII string size limits + * Check with struct sockaddr_ng if changing. + */ #define NG_TYPESIZ 32 /* max type name len (including null) */ #define NG_HOOKSIZ 32 /* max hook name len (including null) */ #define NG_NODESIZ 32 /* max node name len (including null) */ diff --git a/sys/netgraph/ng_socket.h b/sys/netgraph/ng_socket.h index 7556ec645f3d..9b537a52814a 100644 --- a/sys/netgraph/ng_socket.h +++ b/sys/netgraph/ng_socket.h @@ -60,7 +60,7 @@ enum { struct sockaddr_ng { unsigned char sg_len; /* total length */ sa_family_t sg_family; /* address family */ - char sg_data[14]; /* actually longer; address value */ + char sg_data[32]; /* see NG_NODESIZ in ng_message.h */ }; #endif /* _NETGRAPH_NG_SOCKET_H_ */ diff --git a/tests/sys/netgraph/socket.c b/tests/sys/netgraph/socket.c index b5216dcc2c39..bd40e4358866 100644 --- a/tests/sys/netgraph/socket.c +++ b/tests/sys/netgraph/socket.c @@ -53,12 +53,7 @@ ATF_TC_BODY(getsockname, tc) /* Named node. */ ATF_REQUIRE(NgMkSockNode(name, &cs, NULL) == 0); ATF_REQUIRE(getsockname(cs, (struct sockaddr *)&sg, &len) == 0); -#if 0 - /* sockaddr_ng truncates name now. */ ATF_REQUIRE(strcmp(sg.sg_data, NAME) == 0); -#else - ATF_REQUIRE(strncmp(sg.sg_data, NAME, sizeof(sg.sg_data)) == 0); -#endif } ATF_TP_ADD_TCS(tp)