[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <m2sf88funf.fsf@gmail.com>
Date: Thu, 24 Aug 2023 14:16:04 +0100
From: Donald Hunter <donald.hunter@...il.com>
To: Jakub Kicinski <kuba@...nel.org>
Cc: davem@...emloft.net, netdev@...r.kernel.org, edumazet@...gle.com,
pabeni@...hat.com
Subject: Re: [PATCH net-next 2/5] tools: ynl-gen: set length of binary fields
Jakub Kicinski <kuba@...nel.org> writes:
> Remember to set the length field in the request setters.
>
> Signed-off-by: Jakub Kicinski <kuba@...nel.org>
> ---
> tools/net/ynl/generated/ethtool-user.h | 4 ++++
> tools/net/ynl/generated/fou-user.h | 6 ++++++
> tools/net/ynl/ynl-gen-c.py | 1 +
> 3 files changed, 11 insertions(+)
>
> diff --git a/tools/net/ynl/generated/ethtool-user.h b/tools/net/ynl/generated/ethtool-user.h
> index d7d4ba855f43..ddc1a5209992 100644
> --- a/tools/net/ynl/generated/ethtool-user.h
> +++ b/tools/net/ynl/generated/ethtool-user.h
> @@ -1422,6 +1422,7 @@ ethtool_wol_set_req_set_sopass(struct ethtool_wol_set_req *req,
> const void *sopass, size_t len)
> {
> free(req->sopass);
> + req->_present.sopass_len = len;
> req->sopass = malloc(req->_present.sopass_len);
> memcpy(req->sopass, sopass, req->_present.sopass_len);
> }
> @@ -4071,6 +4072,7 @@ ethtool_fec_set_req_set_stats_corrected(struct ethtool_fec_set_req *req,
> const void *corrected, size_t len)
> {
> free(req->stats.corrected);
> + req->stats._present.corrected_len = len;
> req->stats.corrected = malloc(req->stats._present.corrected_len);
> memcpy(req->stats.corrected, corrected, req->stats._present.corrected_len);
> }
> @@ -4079,6 +4081,7 @@ ethtool_fec_set_req_set_stats_uncorr(struct ethtool_fec_set_req *req,
> const void *uncorr, size_t len)
> {
> free(req->stats.uncorr);
> + req->stats._present.uncorr_len = len;
> req->stats.uncorr = malloc(req->stats._present.uncorr_len);
> memcpy(req->stats.uncorr, uncorr, req->stats._present.uncorr_len);
> }
> @@ -4087,6 +4090,7 @@ ethtool_fec_set_req_set_stats_corr_bits(struct ethtool_fec_set_req *req,
> const void *corr_bits, size_t len)
> {
> free(req->stats.corr_bits);
> + req->stats._present.corr_bits_len = len;
> req->stats.corr_bits = malloc(req->stats._present.corr_bits_len);
> memcpy(req->stats.corr_bits, corr_bits, req->stats._present.corr_bits_len);
> }
> diff --git a/tools/net/ynl/generated/fou-user.h b/tools/net/ynl/generated/fou-user.h
> index d8ab50579cd1..a8f860892540 100644
> --- a/tools/net/ynl/generated/fou-user.h
> +++ b/tools/net/ynl/generated/fou-user.h
> @@ -91,6 +91,7 @@ fou_add_req_set_local_v6(struct fou_add_req *req, const void *local_v6,
> size_t len)
> {
> free(req->local_v6);
> + req->_present.local_v6_len = len;
> req->local_v6 = malloc(req->_present.local_v6_len);
> memcpy(req->local_v6, local_v6, req->_present.local_v6_len);
> }
> @@ -99,6 +100,7 @@ fou_add_req_set_peer_v6(struct fou_add_req *req, const void *peer_v6,
> size_t len)
> {
> free(req->peer_v6);
> + req->_present.peer_v6_len = len;
> req->peer_v6 = malloc(req->_present.peer_v6_len);
> memcpy(req->peer_v6, peer_v6, req->_present.peer_v6_len);
> }
> @@ -192,6 +194,7 @@ fou_del_req_set_local_v6(struct fou_del_req *req, const void *local_v6,
> size_t len)
> {
> free(req->local_v6);
> + req->_present.local_v6_len = len;
> req->local_v6 = malloc(req->_present.local_v6_len);
> memcpy(req->local_v6, local_v6, req->_present.local_v6_len);
> }
> @@ -200,6 +203,7 @@ fou_del_req_set_peer_v6(struct fou_del_req *req, const void *peer_v6,
> size_t len)
> {
> free(req->peer_v6);
> + req->_present.peer_v6_len = len;
> req->peer_v6 = malloc(req->_present.peer_v6_len);
> memcpy(req->peer_v6, peer_v6, req->_present.peer_v6_len);
> }
> @@ -280,6 +284,7 @@ fou_get_req_set_local_v6(struct fou_get_req *req, const void *local_v6,
> size_t len)
> {
> free(req->local_v6);
> + req->_present.local_v6_len = len;
> req->local_v6 = malloc(req->_present.local_v6_len);
> memcpy(req->local_v6, local_v6, req->_present.local_v6_len);
> }
> @@ -288,6 +293,7 @@ fou_get_req_set_peer_v6(struct fou_get_req *req, const void *peer_v6,
> size_t len)
> {
> free(req->peer_v6);
> + req->_present.peer_v6_len = len;
> req->peer_v6 = malloc(req->_present.peer_v6_len);
> memcpy(req->peer_v6, peer_v6, req->_present.peer_v6_len);
> }
> diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py
> index bdff8dfc29c9..e27deb199a70 100755
> --- a/tools/net/ynl/ynl-gen-c.py
> +++ b/tools/net/ynl/ynl-gen-c.py
> @@ -428,6 +428,7 @@ from lib import SpecFamily, SpecAttrSet, SpecAttr, SpecOperation, SpecEnumSet, S
>
> def _setter_lines(self, ri, member, presence):
> return [f"free({member});",
> + f"{presence}_len = len;",
> f"{member} = malloc({presence}_len);",
> f'memcpy({member}, {self.c_name}, {presence}_len);']
Reviewed-by: Donald Hunter <donald.hunter@...il.com>
Powered by blists - more mailing lists