diff options
| author | David S. Miller <davem@davemloft.net> | 2023-06-20 09:32:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-06-20 09:32:33 +0100 |
| commit | 8340eef98d45c8822eb6e982b500460371171ee0 (patch) | |
| tree | 34287efefa70085cac7c2d5b940f2045c79cf1d5 /net | |
| parent | 0dbcac3a6dbb32c1de53ebebfd28452965e12950 (diff) | |
| parent | cd9125030689dda69f73f6c2843d63135cb383f0 (diff) | |
| download | lwn-8340eef98d45c8822eb6e982b500460371171ee0.tar.gz lwn-8340eef98d45c8822eb6e982b500460371171ee0.zip | |
Merge tag 'ieee802154-for-net-2023-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan
Stefan Schmidt says:
====================
An update from ieee802154 for your *net* tree:
Two small fixes and MAINTAINERS update this time.
Azeem Shaikh ensured consistent use of strscpy through the tree and fixed
the usage in our trace.h.
Chen Aotian fixed a potential memory leak in the hwsim simulator for
ieee802154.
Miquel Raynal updated the MAINATINERS file with the new team git tree
locations and patchwork URLs.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee802154/trace.h | 2 | ||||
| -rw-r--r-- | net/mac802154/trace.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ieee802154/trace.h b/net/ieee802154/trace.h index e5d8439b9e45..c16db0b326fa 100644 --- a/net/ieee802154/trace.h +++ b/net/ieee802154/trace.h @@ -13,7 +13,7 @@ #define MAXNAME 32 #define WPAN_PHY_ENTRY __array(char, wpan_phy_name, MAXNAME) -#define WPAN_PHY_ASSIGN strlcpy(__entry->wpan_phy_name, \ +#define WPAN_PHY_ASSIGN strscpy(__entry->wpan_phy_name, \ wpan_phy_name(wpan_phy), \ MAXNAME) #define WPAN_PHY_PR_FMT "%s" diff --git a/net/mac802154/trace.h b/net/mac802154/trace.h index 689396d6c76a..1574ecc48075 100644 --- a/net/mac802154/trace.h +++ b/net/mac802154/trace.h @@ -14,7 +14,7 @@ #define MAXNAME 32 #define LOCAL_ENTRY __array(char, wpan_phy_name, MAXNAME) -#define LOCAL_ASSIGN strlcpy(__entry->wpan_phy_name, \ +#define LOCAL_ASSIGN strscpy(__entry->wpan_phy_name, \ wpan_phy_name(local->hw.phy), MAXNAME) #define LOCAL_PR_FMT "%s" #define LOCAL_PR_ARG __entry->wpan_phy_name |