diff mbox series

[Openvpn-devel,ovpn] net: ovpn: use correct array size to parse nested attributes in ovpn_nl_key_swap_doit

Message ID aee74fd22d63489ee9c3256bb3391edc337673bd.1752501854.git.sd@queasysnail.net
State Accepted
Headers
Series [Openvpn-devel,ovpn] net: ovpn: use correct array size to parse nested attributes in ovpn_nl_key_swap_doit |

Commit Message

Sabrina Dubroca July 14, 2025, 2:20 p.m. UTC 
  In ovpn_nl_key_swap_doit, the attributes array used to parse the
OVPN_A_KEYCONF uses OVPN_A_PEER_MAX instead of
OVPN_A_KEYCONF_MAX. Note that this does not cause any bug, since
currently OVPN_A_KEYCONF_MAX < OVPN_A_PEER_MAX.

Fixes: 203e2bf55990 ("ovpn: implement key add/get/del/swap via netlink")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
---
This patch is not urgent since the array ends up being too big for our
needs, so there is no bug.

 drivers/net/ovpn/netlink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Antonio Quartulli July 18, 2025, 2:07 p.m. UTC | #1 
On 14/07/2025 16:20, Sabrina Dubroca wrote:
> In ovpn_nl_key_swap_doit, the attributes array used to parse the
> OVPN_A_KEYCONF uses OVPN_A_PEER_MAX instead of
> OVPN_A_KEYCONF_MAX. Note that this does not cause any bug, since
> currently OVPN_A_KEYCONF_MAX < OVPN_A_PEER_MAX.
> 
> Fixes: 203e2bf55990 ("ovpn: implement key add/get/del/swap via netlink")
> Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>

Nice catch, thanks a lot!
As you suggested I fixed the reverse christmas-tree while applying this 
patch.

It's now queued for sending to net-next.

Regards,
diff mbox series

Patch

diff --git a/drivers/net/ovpn/netlink.c b/drivers/net/ovpn/netlink.c
index a4ec53def46e..655f9d674d57 100644
--- a/drivers/net/ovpn/netlink.c
+++ b/drivers/net/ovpn/netlink.c
@@ -1027,7 +1027,7 @@  int ovpn_nl_key_get_doit(struct sk_buff *skb, struct genl_info *info)
 int ovpn_nl_key_swap_doit(struct sk_buff *skb, struct genl_info *info)
 {
 	struct ovpn_priv *ovpn = info->user_ptr[0];
-	struct nlattr *attrs[OVPN_A_PEER_MAX + 1];
+	struct nlattr *attrs[OVPN_A_KEYCONF_MAX + 1];
 	struct ovpn_peer *peer;
 	u32 peer_id;
 	int ret;