Skip to content

net/nat: g_nat_lock can be used recursively and nat_lock/unlock should be paired. #18571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anchao merged 2 commits into from
Mar 24, 2026
+4 −3
Merged

net/nat: g_nat_lock can be used recursively and nat_lock/unlock should be paired. #18571

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f02c86c
net/nat: g_nat_lock can be used recursively
masc2008 Mar 21, 2026
aa7f118
net/nat: fix missed nat_unlock
masc2008 Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions net/nat/nat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* Private Data
****************************************************************************/

static mutex_t g_nat_lock = NXMUTEX_INITIALIZER;
static rmutex_t g_nat_lock = NXRMUTEX_INITIALIZER;

/****************************************************************************
* Private Functions
Expand Down Expand Up @@ -118,6 +118,7 @@ int nat_enable(FAR struct net_driver_s *dev)
if (IFF_IS_NAT(dev->d_flags))
{
nwarn("WARNING: NAT was already enabled for %s!\n", dev->d_ifname);
nat_unlock();
return -EEXIST;
}

Expand Down Expand Up @@ -418,7 +419,7 @@ uint32_t nat_expire_time(uint8_t protocol)

void nat_lock(void)
{
nxmutex_lock(&g_nat_lock);
nxrmutex_lock(&g_nat_lock);
}

/****************************************************************************
Expand All @@ -431,7 +432,7 @@ void nat_lock(void)

void nat_unlock(void)
{
nxmutex_unlock(&g_nat_lock);
nxrmutex_unlock(&g_nat_lock);
}

#endif /* CONFIG_NET_NAT */
Loading