| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <fc196a91-4cc3-4fc3-a728-567399cc8185@oracle.com>
Date: Mon, 27 Oct 2025 09:53:57 -0400
From: Chuck Lever <chuck.lever@...cle.com>
To: Khushal Chitturi <kc9282016@...il.com>, linux-nfs@...r.kernel.org
Cc: Jeff Layton <jlayton@...nel.org>, Neil Brown <neil@...wn.name>,
Olga Kornievskaia <okorniev@...hat.com>, Dai Ngo <Dai.Ngo@...cle.com>,
Tom Talpey <tom@...pey.com>, "David S . Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>, Simon Horman <horms@...nel.org>,
netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
Khushal Chitturi <kc928206@...il.com>
Subject: Re: [PATCH] xdrgen: handle _XdrString in union encoder/decoder
On 10/26/25 2:00 PM, Khushal Chitturi wrote:
> Running xdrgen on xdrgen/tests/test.x fails when
> generating encoder or decoder functions for union members
> of type _XdrString. It was because _XdrString
> does not have a spec attribute like _XdrBasic,
> leading to AttributeError.
>
> This patch updates emit_union_case_spec_definition
> and emit_union_case_spec_decoder/encoder
> to handle _XdrString by assigning
> type_name = "char *" and avoiding referencing to spec.
>
> Testing: Fixed xdrgen tool was ran on originally failing
> test file (tools/net/sunrpc/xdrgen/tests/test.x) and now completes without AttributeError.
> Modified xdrgen tool was also run against nfs4_1.x (Documentation/sunrpc/xdr/nfs4_1.x).
> The output header file matches with nfs4_1.h (include/linux/sunrpc/xdrgen/nfs4_1.h).
> This validates the patch for all XDR input files currently within the kernel.
>
> Signed-off-by: Khushal Chitturi <kc928206@...il.com>
Hello Kushal -
Fix looks OK, but there are a couple of nits: The email address in your
Signed-off-by does not match your From: address, and I prefer if you
would keep the lines in the patch description shorter than 72
characters. Can you send a v2?
> ---
> tools/net/sunrpc/xdrgen/generators/union.py | 35 ++++++++++++++-----
> .../templates/C/union/encoder/string.j2 | 6 ++++
> 2 files changed, 32 insertions(+), 9 deletions(-)
> create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
>
> diff --git a/tools/net/sunrpc/xdrgen/generators/union.py b/tools/net/sunrpc/xdrgen/generators/union.py
> index 2cca00e279cd..3118dfdddcc4 100644
> --- a/tools/net/sunrpc/xdrgen/generators/union.py
> +++ b/tools/net/sunrpc/xdrgen/generators/union.py
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #!/usr/bin/env python3
> # ex: set filetype=python:
>
> @@ -8,7 +9,7 @@ from jinja2 import Environment
> from generators import SourceGenerator
> from generators import create_jinja2_environment, get_jinja2_template
>
> -from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, get_header_name
> +from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, _XdrString, get_header_name
> from xdr_ast import _XdrDeclaration, _XdrCaseSpec, public_apis, big_endian
>
>
> @@ -40,13 +41,20 @@ def emit_union_case_spec_definition(
> """Emit a definition for an XDR union's case arm"""
> if isinstance(node.arm, _XdrVoid):
> return
> - assert isinstance(node.arm, _XdrBasic)
> + if isinstance(node.arm, _XdrString):
> + type_name = "char *"
> + classifier = ""
> + else:
> + type_name = node.arm.spec.type_name
> + classifier = node.arm.spec.c_classifier
> +
> + assert isinstance(node.arm, (_XdrBasic, _XdrString))
> template = get_jinja2_template(environment, "definition", "case_spec")
> print(
> template.render(
> name=node.arm.name,
> - type=node.arm.spec.type_name,
> - classifier=node.arm.spec.c_classifier,
> + type=type_name,
> + classifier=classifier,
> )
> )
>
> @@ -84,6 +92,12 @@ def emit_union_case_spec_decoder(
>
> if isinstance(node.arm, _XdrVoid):
> return
> + if isinstance(node.arm, _XdrString):
> + type_name = "char *"
> + classifier = ""
> + else:
> + type_name = node.arm.spec.type_name
> + classifier = node.arm.spec.c_classifier
>
> if big_endian_discriminant:
> template = get_jinja2_template(environment, "decoder", "case_spec_be")
> @@ -92,13 +106,13 @@ def emit_union_case_spec_decoder(
> for case in node.values:
> print(template.render(case=case))
>
> - assert isinstance(node.arm, _XdrBasic)
> + assert isinstance(node.arm, (_XdrBasic, _XdrString))
> template = get_jinja2_template(environment, "decoder", node.arm.template)
> print(
> template.render(
> name=node.arm.name,
> - type=node.arm.spec.type_name,
> - classifier=node.arm.spec.c_classifier,
> + type=type_name,
> + classifier=classifier,
> )
> )
>
> @@ -169,7 +183,10 @@ def emit_union_case_spec_encoder(
>
> if isinstance(node.arm, _XdrVoid):
> return
> -
> + if isinstance(node.arm, _XdrString):
> + type_name = "char *"
> + else:
> + type_name = node.arm.spec.type_name
> if big_endian_discriminant:
> template = get_jinja2_template(environment, "encoder", "case_spec_be")
> else:
> @@ -181,7 +198,7 @@ def emit_union_case_spec_encoder(
> print(
> template.render(
> name=node.arm.name,
> - type=node.arm.spec.type_name,
> + type=type_name,
> )
> )
>
> diff --git a/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2 b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
> new file mode 100644
> index 000000000000..2f035a64f1f4
> --- /dev/null
> +++ b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
> @@ -0,0 +1,6 @@
> +{# SPDX-License-Identifier: GPL-2.0 #}
> +{% if annotate %}
> + /* member {{ name }} (variable-length string) */
> +{% endif %}
> + if (!xdrgen_encode_string(xdr, ptr->u.{{ name }}, {{ maxsize }}))
> + return false;
--
Chuck Lever
Powered by blists - more mailing lists