Skip to content

Fix inefficiences and rename nla_strlcpy

[email protected] linux-hardening netdev 6 versions – Applied

Status from this message: Applied, thank you!

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v5 Latest posting 2/23 patches 2 repliesApplied
  2. v5 posting 1/23 patches 7 repliesSuperseded
  3. v43 patches 2 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v3 RFC3 patches13 repliesSuperseded
v2 RFC3 patches14 repliesSuperseded
v13 patches9 repliesSuperseded

Patches in v5 posting 2/2 Applied

#Subject and filesSizeRepliesApplied
1/3Fix unefficient call to memset before memcpu in nla_strlcpy.lib/nlattr.c+2 -10 replies
2/3Modify return value of nla_strlcpy to match that of strscpy.include/net/netlink.h include/net/pkt_cls.h lib/nlattr.c +3 more+30 -190 replies
3/3treewide: rename nla_strlcpy to nla_strscpy.drivers/infiniband/core/nldev.c drivers/net/can/vxcan.c drivers/net/veth.c +26 more+49 -490 replies

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchKees Cook
1/3R-b
2/3R-b
3/3R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v5 thread

Cover letter [RESEND,net-next,PATCH v5 0/3] Fix inefficiences and rename nla_strlcpy

From: Francis Laniel <[email protected]>

Hi.

I hope you are all fine and the same for your relatives.

This patch set answers to first three issues listed in:
https://github.com/KSPP/linux/issues/110

To sum up, the patch contributions are the following:
1. the first patch fixes an inefficiency where some bytes in dst were written twice, one with 0 the other with src content.
2. The second one modifies nla_strlcpy to return the same value as strscpy, i.e. number of bytes written or -E2BIG if src was truncated.
It also modifies code that calls nla_strlcpy and checks for its return value.
3. The third renames nla_strlcpy to nla_strscpy.

Unfortunately, I did not find how to create struct nlattr objects so I tested my modifications on simple char* and with GDB using tc to get to tcf_proto_check_kind.

If you see any way to improve the code or have any remark, feel free to comment.

Best regards and take care of yourselves.

Francis Laniel (3):
Fix unefficient call to memset before memcpu in nla_strlcpy. Modify return value of nla_strlcpy to match that of strscpy.
treewide: rename nla_strlcpy to nla_strscpy.

 drivers/infiniband/core/nldev.c            | 10 +++---
 drivers/net/can/vxcan.c                    |  4 +--
 drivers/net/veth.c                         |  4 +--
 include/linux/genl_magic_struct.h          |  2 +-
 include/net/netlink.h                      |  4 +--
 include/net/pkt_cls.h                      |  2 +-
 kernel/taskstats.c                         |  2 +-
 lib/nlattr.c                               | 42 ++++++++++++++--------
 net/core/fib_rules.c                       |  4 +--
 net/core/rtnetlink.c                       | 12 +++----
 net/decnet/dn_dev.c                        |  2 +-
 net/ieee802154/nl-mac.c                    |  2 +-
 net/ipv4/devinet.c                         |  2 +-
 net/ipv4/fib_semantics.c                   |  2 +-
 net/ipv4/metrics.c                         |  2 +-
 net/netfilter/ipset/ip_set_hash_netiface.c |  4 +--
 net/netfilter/nf_tables_api.c              |  6 ++--
 net/netfilter/nfnetlink_acct.c             |  2 +-
 net/netfilter/nfnetlink_cthelper.c         |  4 +--
 net/netfilter/nft_ct.c                     |  2 +-
 net/netfilter/nft_log.c                    |  2 +-
 net/netlabel/netlabel_mgmt.c               |  2 +-
 net/nfc/netlink.c                          |  2 +-
 net/sched/act_api.c                        |  2 +-
 net/sched/act_ipt.c                        |  2 +-
 net/sched/act_simple.c                     |  4 +--
 net/sched/cls_api.c                        |  2 +-
 net/sched/sch_api.c                        |  2 +-
 net/tipc/netlink_compat.c                  |  2 +-
 29 files changed, 73 insertions(+), 61 deletions(-)
Signature · 1 line
2.20.1