Fix and rename nla_strlcpy to nla_strcpy
Subsystems (15)
RFC PATCH 1/1 Fix and rename nla_strlcpy to nla_strcpy
First, I do hope you are all fine and the same for your relatives.
This 3 patches set answers to three first steps of this issue:
https://github.com/KSPP/linux/issues/110
Basically, I fix an inefficiency in nla_strlcpy where memset was called before memcpy.
Then I modified the returned value to follow strscpy behavior and update where this function is called and returned value is checked.
Finally, I rename nla_strlcpy to nla_strcpy and propagate the modifications in all files where nla_strlcpy was called.
Unfortunately, I did not understand how to instanciate struct nlattr objects so I tested the modified function by calling it directly on char *, this is why I marked this patch as RFC.
If you have any remarks, feel free to share them so I can improve the code.
Here are the stats:
drivers/infiniband/core/nldev.c | 10 +++++----- drivers/misc/lkdtm/Makefile | 1 + 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 | 3 ++- kernel/taskstats.c | 2 +- lib/nlattr.c | 35 ++++++++++++++++++++++------------- 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 +- 30 files changed, 70 insertions(+), 59 deletions(-)
Best regards.
PATCH 1/3 Fix unefficient call to memset before memcpu in nla_strlcpy.
From: Francis Laniel <[email protected]>
This patch solves part 1 of issue: https://github.com/KSPP/linux/issues/110
--- lib/nlattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/nlattr.c +1 -1
@@ -731,8 +731,8 @@ size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)if (dstsize >0 ) {size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; -memset (dst,0 , dstsize);memcpy (dst, src, len); + dst[len] ='\0' ; }return srclen;
Signature · 1 line
2.20.1
Re: [PATCH v1 1/3] Fix unefficient call to memset before memcpu in nla_strlcpy.
Quoted 14 lines · On Fri, Oct 16, 2020 at 02:52:14PM +0200, [email protected]…
From: Francis Laniel <[email protected]>
This patch solves part 1 of issue: https://github.com/KSPP/linux/issues/110
Signed-off-by Francis Laniel <[email protected]>--- lib/nlattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/nlattr.c +0
-0
lib/nlattr.c size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize) · line 735
Quoted 6 lines
lib/nlattr.c +1
-1@@ -731,8 +731,8 @@ size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)if (dstsize >0 ) {size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; -memset (dst,0 , dstsize);memcpy (dst, src, len); + dst[len] ='\0' ;
I don't think this is right: callers are likely depending on the entire destination buffer to be zero-padded. I think you probably want:
memset(dst + len, 0, dstsize - len);
memcpy(dst, src, len);
(but double-check my pointer math)
Quoted 6 lines
lib/nlattr.c +0
-0}return srclen;Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Re: [PATCH v1 1/3] Fix unefficient call to memset before memcpu in nla_strlcpy.
Quoted 1 line · Le samedi 17 octobre 2020, 01:19:59 CEST Kees Cook a écrit :
On Fri, Oct 16, 2020 at 02:52:14PM +0200, [email protected]
Quoted 30 lines · wrote:
Quoted 16 lines
From: Francis Laniel <[email protected]>
This patch solves part 1 of issue:
https://github.com/KSPP/linux/issues/110Signed-off-by Francis Laniel <[email protected]>---
lib/nlattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)lib/nlattr.c +0
-0lib/nlattr.c size_t nla_strlcpy(char *dst, const struct nlattr
Quoted 10 lines
lib/nlattr.c +1
-1@@ -731,8 +731,8 @@ size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)>if (dstsize >0 ) {size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; -memset (dst,0 , dstsize);memcpy (dst, src, len); + dst[len] ='\0' ;I don't think this is right: callers are likely depending on the entire destination buffer to be zero-padded. I think you probably want:
Quoted 5 lines
memset(dst + len, 0, dstsize - len);
memcpy(dst, src, len);(but double-check my pointer math)
I did not understand that the content has to be zero-padded, now your comment on github is clearer!
I will modifiy it for next version and check the math on the paper.
Quoted 3 lines
Quoted 3 lines
lib/nlattr.c +0
-0}return srclen;
Re: [PATCH v1 1/3] Fix unefficient call to memset before memcpu in nla_strlcpy.
In reply to [email protected]Quoted 5 lines · On Fri, Oct 16, 2020 at 3:02 PM <[email protected]> wrote:
This patch solves part 1 of issue: https://github.com/KSPP/linux/issues/110
Signed-off-by Francis Laniel <[email protected]>--- lib/nlattr.c | 2 +-
Your patch touches networking-related code; please include the "NETWORKING [GENERAL]" contacts listed in MAINTAINERS when sending the next version of your patch series.
Re: [PATCH v1 1/3] Fix unefficient call to memset before memcpu in nla_strlcpy.
Quoted 4 lines · Le samedi 17 octobre 2020, 01:29:12 CEST Jann Horn a écrit :
Quoted 3 lines · On Fri, Oct 16, 2020 at 3:02 PM <[email protected]> wrote:
This patch solves part 1 of issue:
https://github.com/KSPP/linux/issues/110
Quoted 8 lines
Quoted 4 lines
Signed-off-by Francis Laniel <[email protected]>---
lib/nlattr.c | 2 +-Your patch touches networking-related code; please include the "NETWORKING [GENERAL]" contacts listed in
MAINTAINERSwhen sending the next version of your patch series.
I will add the networking maintainers to the next version.
PATCH 2/3 Modify return value of nla_strlcpy to match that of strscpy.
In reply to [email protected]From: Francis Laniel <[email protected]>
This patch solves part 2 of issue: https://github.com/KSPP/linux/issues/110
--- include/net/netlink.h | 2 +- include/net/pkt_cls.h | 3 ++- lib/nlattr.c | 31 ++++++++++++++++++++----------- net/sched/act_api.c | 2 +- net/sched/sch_api.c | 2 +- 5 files changed, 25 insertions(+), 15 deletions(-)
include/net/netlink.h +1 -1
@@ -506,7 +506,7 @@ int __nla_parse(struct nlattr **tb, int maxtype, const struct nlattr *head, struct netlink_ext_ack *extack);int nla_policy_len (const struct nla_policy *,int );struct nlattr *nla_find (const struct nlattr *head,int len,int attrtype); -size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize); +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize);char *nla_strdup (const struct nlattr *nla,gfp_t flags);int nla_memcpy (void *dest,const struct nlattr *src,int count);int nla_memcmp (const struct nlattr *nla,const void *data,size_t size);
include/net/pkt_cls.h +2 -1
@@ -4,6 +4,7 @@#include <linux/pkt_cls.h> #include <linux/workqueue.h> +#include <linux/errno.h> #include <net/sch_generic.h> #include <net/act_api.h> #include <net/net_namespace.h>
@@ -512,7 +513,7 @@ tcf_change_indev(struct net *net, struct nlattr *indev_tlv,char indev[IFNAMSIZ ];struct net_device *dev; -if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) >=IFNAMSIZ ) { +if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) == -E2BIG ) {NL_SET_ERR_MSG_ATTR (extack, indev_tlv,"Interface name too long" );return -EINVAL ;
lib/nlattr.c +20 -11
@@ -713,29 +713,38 @@ EXPORT_SYMBOL(nla_find);* @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer +* @returns: -E2BIG if @dstsize is 0 or source buffer length greater than +* @dstsize, otherwise it returns the number of copied characters (not +* including the trailing %NUL). * * Copies at most dstsize - 1 bytes into the destination buffer. -* The result is always a valid NUL-terminated string. Unlike -* strlcpy the destination buffer is always padded out. -* -* Returns the length of the source buffer. +* The result is always a valid NUL-terminated string. */ -size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) { +size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla); +if (dstsize ==0 ||WARN_ON_ONCE (dstsize >INT_MAX )) +return -E2BIG ; +if (srclen >0 && src[srclen -1 ] =='\0' ) srclen--; -if (dstsize >0 ) { -size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; - -memcpy (dst, src, len); - dst[len] ='\0' ; +if (srclen >= dstsize) { + len = dstsize -1 ; + ret = -E2BIG ; + }else { + len = srclen; + ret = len; } -return srclen; +memcpy (dst, src, len); + dst[len] ='\0' ; + +return ret; }EXPORT_SYMBOL (nla_strlcpy);
net/sched/act_api.c +1 -1
@@ -935,7 +935,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,NL_SET_ERR_MSG (extack,"TC action kind must be specified" ); goto err_out; } -if (nla_strlcpy (act_name, kind,IFNAMSIZ ) >=IFNAMSIZ ) { +if (nla_strlcpy (act_name, kind,IFNAMSIZ ) == -E2BIG ) {NL_SET_ERR_MSG (extack,"TC action name too long" ); goto err_out; }
net/sched/sch_api.c +1 -1
@@ -1170,7 +1170,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,#ifdef CONFIG_MODULES if (ops ==NULL && kind !=NULL ) {char name[IFNAMSIZ ]; -if (nla_strlcpy (name, kind,IFNAMSIZ ) <IFNAMSIZ ) { +if (nla_strlcpy (name, kind,IFNAMSIZ ) != -E2BIG ) {/* We dropped the RTNL semaphore in order to * perform the module load. So, even if we * succeeded in loading the module we have to
Signature · 1 line
2.20.1
Re: [PATCH v1 2/3] Modify return value of nla_strlcpy to match that of strscpy.
Quoted 3 lines · On Fri, Oct 16, 2020 at 02:52:15PM +0200, [email protected]…
From: Francis Laniel <[email protected]>
This patch solves part 2 of issue: https://github.com/KSPP/linux/issues/110
As with the others, this needs a full commit log (imagine someone doesn't have access to read that issue, etc).
Quoted 36 lines
Signed-off-by Francis Laniel <[email protected]>--- include/net/netlink.h | 2 +- include/net/pkt_cls.h | 3 ++- lib/nlattr.c | 31 ++++++++++++++++++++----------- net/sched/act_api.c | 2 +- net/sched/sch_api.c | 2 +- 5 files changed, 25 insertions(+), 15 deletions(-)include/net/netlink.h +1
-1@@ -506,7 +506,7 @@ int __nla_parse(struct nlattr **tb, int maxtype, const struct nlattr *head, struct netlink_ext_ack *extack);int nla_policy_len (const struct nla_policy *,int );struct nlattr *nla_find (const struct nlattr *head,int len,int attrtype); -size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize); +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize);char *nla_strdup (const struct nlattr *nla,gfp_t flags);int nla_memcpy (void *dest,const struct nlattr *src,int count);int nla_memcmp (const struct nlattr *nla,const void *data,size_t size);include/net/pkt_cls.h +1
-0@@ -4,6 +4,7 @@#include <linux/pkt_cls.h> #include <linux/workqueue.h> +#include <linux/errno.h> #include <net/sch_generic.h> #include <net/act_api.h> #include <net/net_namespace.h>
include/net/pkt_cls.h tcf_change_indev(struct net *net, struct nlattr *indev_tlv, · line 516
Quoted 5 lines
include/net/pkt_cls.h +1
-1@@ -512,7 +513,7 @@ tcf_change_indev(struct net *net, struct nlattr *indev_tlv,char indev[IFNAMSIZ ];struct net_device *dev; -if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) >=IFNAMSIZ ) { +if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) == -E2BIG ) {
I would make these tests all be "< 0" rather than specifically -E2BIG.
Quoted 22 lines
include/net/pkt_cls.h +0
-0NL_SET_ERR_MSG_ATTR (extack, indev_tlv,"Interface name too long" );return -EINVAL ;lib/nlattr.c +4
-4@@ -713,29 +713,38 @@ EXPORT_SYMBOL(nla_find);* @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer +* @returns: -E2BIG if @dstsize is 0 or source buffer length greater than +* @dstsize, otherwise it returns the number of copied characters (not +* including the trailing %NUL). * * Copies at most dstsize - 1 bytes into the destination buffer. -* The result is always a valid NUL-terminated string. Unlike -* strlcpy the destination buffer is always padded out. -* -* Returns the length of the source buffer. +* The result is always a valid NUL-terminated string. */
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 731
Quoted 10 lines
lib/nlattr.c +5
-1-size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) { +size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla); +if (dstsize ==0 ||WARN_ON_ONCE (dstsize >INT_MAX )) +return -E2BIG ;
Cool, yeah, good to include.
Quoted 14 lines
lib/nlattr.c +6
-5+if (srclen >0 && src[srclen -1 ] =='\0' ) srclen--; -if (dstsize >0 ) { -size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; - -memcpy (dst, src, len); - dst[len] ='\0' ; +if (srclen >= dstsize) { + len = dstsize -1 ; + ret = -E2BIG ; + }else { + len = srclen;
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 749
Quoted 10 lines
lib/nlattr.c +5
-1+ ret = len; } -return srclen; +memcpy (dst, src, len); + dst[len] ='\0' ; + +return ret; }EXPORT_SYMBOL (nla_strlcpy);
Otherwise, I think this looks good. (Though same note about zero-padding.)
Quoted 30 lines
net/sched/act_api.c +1
-1@@ -935,7 +935,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,NL_SET_ERR_MSG (extack,"TC action kind must be specified" ); goto err_out; } -if (nla_strlcpy (act_name, kind,IFNAMSIZ ) >=IFNAMSIZ ) { +if (nla_strlcpy (act_name, kind,IFNAMSIZ ) == -E2BIG ) {NL_SET_ERR_MSG (extack,"TC action name too long" ); goto err_out; }net/sched/sch_api.c +1
-1@@ -1170,7 +1170,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,#ifdef CONFIG_MODULES if (ops ==NULL && kind !=NULL ) {char name[IFNAMSIZ ]; -if (nla_strlcpy (name, kind,IFNAMSIZ ) <IFNAMSIZ ) { +if (nla_strlcpy (name, kind,IFNAMSIZ ) != -E2BIG ) {/* We dropped the RTNL semaphore in order to * perform the module load. So, even if we * succeeded in loading the module we have to Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
Re: [PATCH v1 2/3] Modify return value of nla_strlcpy to match that of strscpy.
Quoted 1 line · Le samedi 17 octobre 2020, 01:23:10 CEST Kees Cook a écrit :
On Fri, Oct 16, 2020 at 02:52:15PM +0200, [email protected]
Quoted 7 lines · wrote:
Quoted 4 lines
From: Francis Laniel <[email protected]>
This patch solves part 2 of issue:
https://github.com/KSPP/linux/issues/110As with the others, this needs a full commit log (imagine someone doesn't have access to read that issue, etc).
I will reexplain the whole problem into the commit message to give more context to it in the next version.
Quoted 50 lines
Quoted 50 lines
Signed-off-by Francis Laniel <[email protected]>---
include/net/netlink.h | 2 +- include/net/pkt_cls.h | 3 ++- lib/nlattr.c | 31 ++++++++++++++++++++----------- net/sched/act_api.c | 2 +- net/sched/sch_api.c | 2 +- 5 files changed, 25 insertions(+), 15 deletions(-)include/net/netlink.h +0
-0@@ -506,7 +506,7 @@ int __nla_parse(struct nlattr **tb, int maxtype, conststruct nlattr *head,>
include/net/netlink.h +1
-1struct netlink_ext_ack *extack);int nla_policy_len (const struct nla_policy *,int );struct nlattr *nla_find (const struct nlattr *head,int len,int attrtype); -size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize); +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize);char *nla_strdup (const struct nlattr *nla,gfp_t flags);int nla_memcpy (void *dest,const struct nlattr *src,int count);int nla_memcmp (const struct nlattr *nla,const void *data,size_t size);include/net/pkt_cls.h +1
-0@@ -4,6 +4,7 @@#include <linux/pkt_cls.h> #include <linux/workqueue.h> +#include <linux/errno.h> #include <net/sch_generic.h> #include <
net/act_api.h>
#include <net/net_namespace.h>include/net/pkt_cls.h +0
-0@@ -512,7 +513,7 @@ tcf_change_indev(struct net *net, struct nlattr *indev_tlv,>char indev[IFNAMSIZ ];struct net_device *dev;
Quoted 5 lines
include/net/pkt_cls.h tcf_change_indev(struct net *net, struct nlattr *indev_tlv, · line 516
Quoted 2 lines
include/net/pkt_cls.h +1
-1-if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) >=IFNAMSIZ ) { +if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) == -E2BIG ) {I would make these tests all be "< 0" rather than specifically
-E2BIG.
You are right, it would permit to add more -ESOMETHING to nla_sltrcpy without changing the caller each time.
Quoted 39 lines
Quoted 39 lines
include/net/pkt_cls.h +0
-0NL_SET_ERR_MSG_ATTR(extack, indev_tlv,include/net/pkt_cls.h +0
-0"Interface name too long");return -EINVAL ;lib/nlattr.c +7
-5@@ -713,29 +713,38 @@ EXPORT_SYMBOL(nla_find);* @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer +* @returns: -E2BIG if @dstsize is 0 or source buffer length greater than +* @dstsize, otherwise it returns the number of copied characters (not +* including the trailing %NUL). * * Copies at most dstsize - 1 bytes into the destination buffer. -* The result is always a valid NUL-terminated string. Unlike -* strlcpy the destination buffer is always padded out. -* -* Returns the length of the source buffer. +* The result is always a valid NUL-terminated string. */ -size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) { +size_t len; +ssize_t ret;
Quoted 8 lines
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 731
Quoted 5 lines
lib/nlattr.c +2
-0size_t srclen =nla_len (nla);char *src =nla_data (nla); +if (dstsize ==0 ||WARN_ON_ONCE (dstsize >INT_MAX )) +return -E2BIG ;Cool, yeah, good to include.
Thank you!
Quoted 70 lines
Quoted 18 lines
lib/nlattr.c +7
-5+if (srclen >0 && src[srclen -1 ] =='\0' ) srclen--; -if (dstsize >0 ) { -size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; - -memcpy (dst, src, len); - dst[len] ='\0' ; +if (srclen >= dstsize) { + len = dstsize -1 ; + ret = -E2BIG ; + }else { + len = srclen; + ret = len;lib/nlattr.c EXPORT_SYMBOL(nla_find);
Quoted 10 lines
lib/nlattr.c +4
-1} -return srclen; +memcpy (dst, src, len); + dst[len] ='\0' ; + +return ret; }EXPORT_SYMBOL (nla_strlcpy);Otherwise, I think this looks good. (Though same note about zero-padding.)
Quoted 38 lines
net/sched/act_api.c +0
-0@@ -935,7 +935,7 @@ struct tc_action *tcf_action_init_1(struct net *net,struct
tcf_proto*tp,>net/sched/act_api.c +1
-1NL_SET_ERR_MSG (extack,"TC action kind must be specified" ); goto err_out; } -if (nla_strlcpy (act_name, kind,IFNAMSIZ ) >=IFNAMSIZ ) { +if (nla_strlcpy (act_name, kind,IFNAMSIZ ) == -E2BIG ) {NL_SET_ERR_MSG (extack,"TC action name too long" ); goto err_out; }net/sched/sch_api.c +1
-1@@ -1170,7 +1170,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,>#ifdef CONFIG_MODULES if (ops ==NULL && kind !=NULL ) {char name[IFNAMSIZ ]; -if (nla_strlcpy (name, kind,IFNAMSIZ ) <IFNAMSIZ ) { +if (nla_strlcpy (name, kind,IFNAMSIZ ) != -E2BIG ) {/* We dropped the RTNL semaphore in order to * perform the module load. So, even if we * succeeded in loading the module we have to
Re: [PATCH v1 2/3] Modify return value of nla_strlcpy to match that of strscpy.
In reply to [email protected]Quoted 10 lines · On Fri, Oct 16, 2020 at 3:02 PM <[email protected]> wrote:
This patch solves part 2 of issue: https://github.com/KSPP/linux/issues/110
Signed-off-by Francis Laniel <[email protected]>--- include/net/netlink.h | 2 +- include/net/pkt_cls.h | 3 ++- lib/nlattr.c | 31 ++++++++++++++++++++----------- net/sched/act_api.c | 2 +- net/sched/sch_api.c | 2 +- 5 files changed, 25 insertions(+), 15 deletions(-)
[...]
Quoted 9 lines
lib/nlattr.c +1
-0@@ -713,29 +713,38 @@ EXPORT_SYMBOL(nla_find);* @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer +* @returns: -E2BIG if @dstsize is 0 or source buffer length greater than
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 722
Quoted 10 lines
lib/nlattr.c +3
-4+* @dstsize, otherwise it returns the number of copied characters (not +* including the trailing %NUL). * * Copies at most dstsize - 1 bytes into the destination buffer. -* The result is always a valid NUL-terminated string. Unlike -* strlcpy the destination buffer is always padded out. -* -* Returns the length of the source buffer. +* The result is always a valid NUL-terminated string. */
What about tcf_proto_check_kind()?
Re: [PATCH v1 2/3] Modify return value of nla_strlcpy to match that of strscpy.
Quoted 39 lines · Le samedi 17 octobre 2020, 02:41:33 CEST Jann Horn a écrit :
Quoted 12 lines · On Fri, Oct 16, 2020 at 3:02 PM <[email protected]> wrote:
This patch solves part 2 of issue:
https://github.com/KSPP/linux/issues/110Signed-off-by Francis Laniel <[email protected]>---
include/net/netlink.h | 2 +- include/net/pkt_cls.h | 3 ++- lib/nlattr.c | 31 ++++++++++++++++++++----------- net/sched/act_api.c | 2 +- net/sched/sch_api.c | 2 +- 5 files changed, 25 insertions(+), 15 deletions(-)[...]
Quoted 23 lines
lib/nlattr.c +4
-4@@ -713,29 +713,38 @@ EXPORT_SYMBOL(nla_find);* @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer +* @returns: -E2BIG if @dstsize is 0 or source buffer length greater than +* @dstsize, otherwise it returns the number of copied characters (not +* including the trailing %NUL). * * Copies at most dstsize - 1 bytes into the destination buffer. -* The result is always a valid NUL-terminated string. Unlike -* strlcpy the destination buffer is always padded out. -* -* Returns the length of the source buffer. +* The result is always a valid NUL-terminated string.
Quoted 3 lines
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 727
Quoted 1 line
lib/nlattr.c +0
-0*/ What about
tcf_proto_check_kind()?
Good catch!
I just searched for "if (nla_strlcpy" in the code to propagate change. I will add it to the next version!
PATCH 3/3 Rename nla_strlcpy to nla_strcpy.
In reply to [email protected]From: Francis Laniel <[email protected]>
This patch solves part 3 of issue: https://github.com/KSPP/linux/issues/110
--- drivers/infiniband/core/nldev.c | 10 +++++----- drivers/misc/lkdtm/Makefile | 1 + 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 | 6 +++--- 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 +- 30 files changed, 50 insertions(+), 49 deletions(-)
drivers/infiniband/core/nldev.c +5 -5
@@ -932,7 +932,7 @@ static int nldev_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh,if (tb[RDMA_NLDEV_ATTR_DEV_NAME ]) {char name[IB_DEVICE_NAME_MAX ] = {}; -nla_strlcpy (name, tb[RDMA_NLDEV_ATTR_DEV_NAME ], +nla_strcpy (name, tb[RDMA_NLDEV_ATTR_DEV_NAME ],IB_DEVICE_NAME_MAX );if (strlen (name) ==0 ) { err = -EINVAL ;
@@ -1529,13 +1529,13 @@ static int nldev_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, !tb[RDMA_NLDEV_ATTR_LINK_TYPE] || !tb[RDMA_NLDEV_ATTR_NDEV_NAME])return -EINVAL ; -nla_strlcpy (ibdev_name, tb[RDMA_NLDEV_ATTR_DEV_NAME ], +nla_strcpy (ibdev_name, tb[RDMA_NLDEV_ATTR_DEV_NAME ],sizeof (ibdev_name));if (strchr (ibdev_name,'%' ) ||strlen (ibdev_name) ==0 )return -EINVAL ; -nla_strlcpy (type, tb[RDMA_NLDEV_ATTR_LINK_TYPE ],sizeof (type)); -nla_strlcpy (ndev_name, tb[RDMA_NLDEV_ATTR_NDEV_NAME ], +nla_strcpy (type, tb[RDMA_NLDEV_ATTR_LINK_TYPE ],sizeof (type)); +nla_strcpy (ndev_name, tb[RDMA_NLDEV_ATTR_NDEV_NAME ],sizeof (ndev_name)); ndev =dev_get_by_name (sock_net (skb->sk), ndev_name);
@@ -1602,7 +1602,7 @@ static int nldev_get_chardev(struct sk_buff *skb, struct nlmsghdr *nlh,if (err || !tb[RDMA_NLDEV_ATTR_CHARDEV_TYPE ])return -EINVAL ; -nla_strlcpy (client_name, tb[RDMA_NLDEV_ATTR_CHARDEV_TYPE ], +nla_strcpy (client_name, tb[RDMA_NLDEV_ATTR_CHARDEV_TYPE ],sizeof (client_name));if (tb[RDMA_NLDEV_ATTR_DEV_INDEX ]) {
drivers/misc/lkdtm/Makefile +1 -0
@@ -10,6 +10,7 @@ lkdtm-$(CONFIG_LKDTM) += rodata_objcopy.o lkdtm-$(CONFIG_LKDTM) += usercopy.o lkdtm-$(CONFIG_LKDTM) += stackleak.o lkdtm-$(CONFIG_LKDTM) += cfi.o +lkdtm-$(CONFIG_LKDTM) += fortify.o KASAN_SANITIZE_stackleak.o := n KCOV_INSTRUMENT_rodata.o := n
drivers/net/can/vxcan.c +2 -2
@@ -186,7 +186,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, }if (ifmp && tbp[IFLA_IFNAME ]) { -nla_strlcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); name_assign_type =NET_NAME_USER ; }else {snprintf (ifname,IFNAMSIZ ,DRV_NAME "%%d" );
@@ -223,7 +223,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,/* register first device */ if (tb[IFLA_IFNAME ]) -nla_strlcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ );else snprintf (dev->name,IFNAMSIZ ,DRV_NAME "%%d" );
drivers/net/veth.c +2 -2
@@ -1329,7 +1329,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, }if (ifmp && tbp[IFLA_IFNAME ]) { -nla_strlcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); name_assign_type =NET_NAME_USER ; }else {snprintf (ifname,IFNAMSIZ ,DRV_NAME "%%d" );
@@ -1379,7 +1379,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,eth_hw_addr_random (dev);if (tb[IFLA_IFNAME ]) -nla_strlcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ );else snprintf (dev->name,IFNAMSIZ ,DRV_NAME "%%d" );
include/linux/genl_magic_struct.h +1 -1
@@ -89,7 +89,7 @@ static inline int nla_put_u64_0pad(struct sk_buff *skb, int attrtype, u64 value) nla_get_u64, nla_put_u64_0pad, false)#define __str_field (attr_nr, attr_flag, name, maxlen) \ __array(attr_nr, attr_flag, name, NLA_NUL_STRING, char, maxlen, \ - nla_strlcpy, nla_put, false) + nla_strcpy, nla_put, false)#define __bin_field (attr_nr, attr_flag, name, maxlen) \ __array(attr_nr, attr_flag, name, NLA_BINARY, char, maxlen, \ nla_memcpy, nla_put, false)
include/net/netlink.h +2 -2
@@ -142,7 +142,7 @@* Attribute Misc: * nla_memcpy(dest, nla, count) copy attribute into memory * nla_memcmp(nla, data, size) compare attribute with memory area -* nla_strlcpy(dst, nla, size) copy attribute to a sized string +* nla_strcpy(dst, nla, size) copy attribute to a sized string * nla_strcmp(nla, str) compare attribute with string * * Attribute Parsing:
@@ -506,7 +506,7 @@ int __nla_parse(struct nlattr **tb, int maxtype, const struct nlattr *head, struct netlink_ext_ack *extack);int nla_policy_len (const struct nla_policy *,int );struct nlattr *nla_find (const struct nlattr *head,int len,int attrtype); -ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize); +ssize_t nla_strcpy (char *dst,const struct nlattr *nla,size_t dstsize);char *nla_strdup (const struct nlattr *nla,gfp_t flags);int nla_memcpy (void *dest,const struct nlattr *src,int count);int nla_memcmp (const struct nlattr *nla,const void *data,size_t size);
include/net/pkt_cls.h +1 -1
@@ -513,7 +513,7 @@ tcf_change_indev(struct net *net, struct nlattr *indev_tlv,char indev[IFNAMSIZ ];struct net_device *dev; -if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) == -E2BIG ) { +if (nla_strcpy (indev, indev_tlv,IFNAMSIZ ) == -E2BIG ) {NL_SET_ERR_MSG_ATTR (extack, indev_tlv,"Interface name too long" );return -EINVAL ;
kernel/taskstats.c +1 -1
@@ -346,7 +346,7 @@ static int parse(struct nlattr *na, struct cpumask *mask) data =kmalloc (len,GFP_KERNEL );if (!data)return -ENOMEM ; -nla_strlcpy (data, na, len); +nla_strcpy (data, na, len); ret =cpulist_parse (data, mask);kfree (data);return ret;
lib/nlattr.c +3 -3
@@ -709,7 +709,7 @@ struct nlattr *nla_find(const struct nlattr *head, int len, int attrtype)EXPORT_SYMBOL (nla_find);/** -* nla_strlcpy - Copy string attribute payload into a sized buffer +* nla_strcpy - Copy string attribute payload into a sized buffer * @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer
@@ -720,7 +720,7 @@ EXPORT_SYMBOL(nla_find);* Copies at most dstsize - 1 bytes into the destination buffer. * The result is always a valid NUL-terminated string. */ -ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strcpy (char *dst,const struct nlattr *nla,size_t dstsize) {size_t len;ssize_t ret;
@@ -746,7 +746,7 @@ ssize_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)return ret; } -EXPORT_SYMBOL (nla_strlcpy); +EXPORT_SYMBOL (nla_strcpy);/** * nla_strdup - Copy string attribute payload into a newly allocated buffer
net/core/fib_rules.c +2 -2
@@ -563,7 +563,7 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,struct net_device *dev; nlrule->iifindex =-1 ; -nla_strlcpy (nlrule->iifname, tb[FRA_IIFNAME ],IFNAMSIZ ); +nla_strcpy (nlrule->iifname, tb[FRA_IIFNAME ],IFNAMSIZ ); dev =__dev_get_by_name (net, nlrule->iifname);if (dev) nlrule->iifindex = dev->ifindex;
@@ -573,7 +573,7 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,struct net_device *dev; nlrule->oifindex =-1 ; -nla_strlcpy (nlrule->oifname, tb[FRA_OIFNAME ],IFNAMSIZ ); +nla_strcpy (nlrule->oifname, tb[FRA_OIFNAME ],IFNAMSIZ ); dev =__dev_get_by_name (net, nlrule->oifname);if (dev) nlrule->oifindex = dev->ifindex;
net/core/rtnetlink.c +6 -6
@@ -1939,7 +1939,7 @@ static const struct rtnl_link_ops *linkinfo_to_kind_ops(const struct nlattr *nlaif (linfo[IFLA_INFO_KIND ]) {char kind[MODULE_NAME_LEN ]; -nla_strlcpy (kind, linfo[IFLA_INFO_KIND ],sizeof (kind)); +nla_strcpy (kind, linfo[IFLA_INFO_KIND ],sizeof (kind)); ops =rtnl_link_ops_get (kind); }
@@ -2953,9 +2953,9 @@ static struct net_device *rtnl_dev_get(struct net *net,if (!ifname) { ifname = buffer;if (ifname_attr) -nla_strlcpy (ifname, ifname_attr,IFNAMSIZ ); +nla_strcpy (ifname, ifname_attr,IFNAMSIZ );else if (altifname_attr) -nla_strlcpy (ifname, altifname_attr,ALTIFNAMSIZ ); +nla_strcpy (ifname, altifname_attr,ALTIFNAMSIZ );else return NULL ; }
@@ -2983,7 +2983,7 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, goto errout;if (tb[IFLA_IFNAME ]) -nla_strlcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ );else ifname[0 ] ='\0' ;
@@ -3264,7 +3264,7 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,return err;if (tb[IFLA_IFNAME ]) -nla_strlcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ );else ifname[0 ] ='\0' ;
@@ -3296,7 +3296,7 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,memset (linkinfo,0 ,sizeof (linkinfo));if (linkinfo[IFLA_INFO_KIND ]) { -nla_strlcpy (kind, linkinfo[IFLA_INFO_KIND ],sizeof (kind)); +nla_strcpy (kind, linkinfo[IFLA_INFO_KIND ],sizeof (kind)); ops =rtnl_link_ops_get (kind); }else { kind[0 ] ='\0' ;
net/decnet/dn_dev.c +1 -1
@@ -658,7 +658,7 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, ifa->ifa_dev = dn_db;if (tb[IFA_LABEL ]) -nla_strlcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ ); +nla_strcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ );else memcpy (ifa->ifa_label, dev->name,IFNAMSIZ );
net/ieee802154/nl-mac.c +1 -1
@@ -149,7 +149,7 @@ static struct net_device *ieee802154_nl_get_dev(struct genl_info *info)if (info->attrs[IEEE802154_ATTR_DEV_NAME ]) {char name[IFNAMSIZ +1 ]; -nla_strlcpy (name, info->attrs[IEEE802154_ATTR_DEV_NAME ], +nla_strcpy (name, info->attrs[IEEE802154_ATTR_DEV_NAME ],sizeof (name)); dev =dev_get_by_name (&init_net, name); }else if (info->attrs[IEEE802154_ATTR_DEV_INDEX ]) {
net/ipv4/devinet.c +1 -1
@@ -881,7 +881,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, ifa->ifa_broadcast =nla_get_in_addr (tb[IFA_BROADCAST ]);if (tb[IFA_LABEL ]) -nla_strlcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ ); +nla_strcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ );else memcpy (ifa->ifa_label, dev->name,IFNAMSIZ );
net/ipv4/fib_semantics.c +1 -1
@@ -973,7 +973,7 @@ bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi)char tmp[TCP_CA_NAME_MAX ];bool ecn_ca = false; -nla_strlcpy (tmp, nla,sizeof (tmp)); +nla_strcpy (tmp, nla,sizeof (tmp)); val =tcp_ca_get_key_by_name (fi->fib_net, tmp, &ecn_ca); }else {if (nla_len (nla) !=sizeof (u32))
net/ipv4/metrics.c +1 -1
@@ -31,7 +31,7 @@ static int ip_metrics_convert(struct net *net, struct nlattr *fc_mx,if (type ==RTAX_CC_ALGO ) {char tmp[TCP_CA_NAME_MAX ]; -nla_strlcpy (tmp, nla,sizeof (tmp)); +nla_strcpy (tmp, nla,sizeof (tmp)); val =tcp_ca_get_key_by_name (net, tmp, &ecn_ca);if (val ==TCP_CA_UNSPEC ) {NL_SET_ERR_MSG (extack,"Unknown tcp congestion algorithm" );
net/netfilter/ipset/ip_set_hash_netiface.c +2 -2
@@ -225,7 +225,7 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],if (e.cidr >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; } -nla_strlcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ ); +nla_strcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ );if (tb[IPSET_ATTR_CADT_FLAGS ]) {u32 cadt_flags =ip_set_get_h32 (tb[IPSET_ATTR_CADT_FLAGS ]);
@@ -442,7 +442,7 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[],ip6_netmask (&e.ip, e.cidr); -nla_strlcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ ); +nla_strcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ );if (tb[IPSET_ATTR_CADT_FLAGS ]) {u32 cadt_flags =ip_set_get_h32 (tb[IPSET_ATTR_CADT_FLAGS ]);
net/netfilter/nf_tables_api.c +3 -3
@@ -1281,7 +1281,7 @@ static struct nft_chain *nft_chain_lookup(struct net *net,if (nla ==NULL )return ERR_PTR (-EINVAL ); -nla_strlcpy (search, nla,sizeof (search)); +nla_strcpy (search, nla,sizeof (search));WARN_ON (!rcu_read_lock_held () && !lockdep_commit_lock_is_held (net));
@@ -1721,7 +1721,7 @@ static struct nft_hook *nft_netdev_hook_alloc(struct net *net, goto err_hook_alloc; } -nla_strlcpy (ifname, attr,IFNAMSIZ ); +nla_strcpy (ifname, attr,IFNAMSIZ ); dev =__dev_get_by_name (net, ifname);if (!dev) { err = -ENOENT ;
@@ -5734,7 +5734,7 @@ struct nft_object *nft_obj_lookup(const struct net *net,struct rhlist_head *tmp, *list;struct nft_object *obj; -nla_strlcpy (search, nla,sizeof (search)); +nla_strcpy (search, nla,sizeof (search)); k.name = search; WARN_ON_ONCE(!rcu_read_lock_held() &&
net/netfilter/nfnetlink_acct.c +1 -1
@@ -112,7 +112,7 @@ static int nfnl_acct_new(struct net *net, struct sock *nfnl, nfacct->flags = flags; } -nla_strlcpy (nfacct->name, tb[NFACCT_NAME ],NFACCT_NAME_MAX ); +nla_strcpy (nfacct->name, tb[NFACCT_NAME ],NFACCT_NAME_MAX );if (tb[NFACCT_BYTES ]) { atomic64_set(&nfacct->bytes,
net/netfilter/nfnetlink_cthelper.c +2 -2
@@ -146,7 +146,7 @@ nfnl_cthelper_expect_policy(struct nf_conntrack_expect_policy *expect_policy, !tb[NFCTH_POLICY_EXPECT_TIMEOUT])return -EINVAL ; -nla_strlcpy (expect_policy->name, +nla_strcpy (expect_policy->name, tb[NFCTH_POLICY_NAME ],NF_CT_HELPER_NAME_LEN ); expect_policy->max_expected =ntohl (nla_get_be32 (tb[NFCTH_POLICY_EXPECT_MAX ]));
@@ -233,7 +233,7 @@ nfnl_cthelper_create(const struct nlattr * const tb[],if (ret <0 ) goto err1; -nla_strlcpy (helper->name, +nla_strcpy (helper->name, tb[NFCTH_NAME ],NF_CT_HELPER_NAME_LEN ); size =ntohl (nla_get_be32 (tb[NFCTH_PRIV_DATA_LEN ])); if (size > sizeof_field(struct nf_conn_help, data)) {
net/netfilter/nft_ct.c +1 -1
@@ -990,7 +990,7 @@ static int nft_ct_helper_obj_init(const struct nft_ctx *ctx,if (!priv->l4proto)return -ENOENT ; -nla_strlcpy (name, tb[NFTA_CT_HELPER_NAME ],sizeof (name)); +nla_strcpy (name, tb[NFTA_CT_HELPER_NAME ],sizeof (name));if (tb[NFTA_CT_HELPER_L3PROTO ]) family =ntohs (nla_get_be16 (tb[NFTA_CT_HELPER_L3PROTO ]));
net/netfilter/nft_log.c +1 -1
@@ -152,7 +152,7 @@ static int nft_log_init(const struct nft_ctx *ctx, priv->prefix =kmalloc (nla_len (nla) +1 ,GFP_KERNEL );if (priv->prefix ==NULL )return -ENOMEM ; -nla_strlcpy (priv->prefix, nla,nla_len (nla) +1 ); +nla_strcpy (priv->prefix, nla,nla_len (nla) +1 ); }else { priv->prefix = (char *)nft_log_null_prefix; }
net/netlabel/netlabel_mgmt.c +1 -1
@@ -95,7 +95,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info, ret_val = -ENOMEM ; goto add_free_entry; } -nla_strlcpy (entry->domain, +nla_strcpy (entry->domain, info->attrs[NLBL_MGMT_A_DOMAIN ], tmp_size); }
net/nfc/netlink.c +1 -1
@@ -1226,7 +1226,7 @@ static int nfc_genl_fw_download(struct sk_buff *skb, struct genl_info *info)if (!dev)return -ENODEV ; -nla_strlcpy (firmware_name, info->attrs[NFC_ATTR_FIRMWARE_NAME ], +nla_strcpy (firmware_name, info->attrs[NFC_ATTR_FIRMWARE_NAME ],sizeof (firmware_name)); rc =nfc_fw_download (dev, firmware_name);
net/sched/act_api.c +1 -1
@@ -935,7 +935,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,NL_SET_ERR_MSG (extack,"TC action kind must be specified" ); goto err_out; } -if (nla_strlcpy (act_name, kind,IFNAMSIZ ) == -E2BIG ) { +if (nla_strcpy (act_name, kind,IFNAMSIZ ) == -E2BIG ) {NL_SET_ERR_MSG (extack,"TC action name too long" ); goto err_out; }
net/sched/act_ipt.c +1 -1
@@ -166,7 +166,7 @@ static int __tcf_ipt_init(struct net *net, unsigned int id, struct nlattr *nla,if (unlikely (!tname)) goto err1;if (tb[TCA_IPT_TABLE ] ==NULL || -nla_strlcpy (tname, tb[TCA_IPT_TABLE ],IFNAMSIZ ) >=IFNAMSIZ ) +nla_strcpy (tname, tb[TCA_IPT_TABLE ],IFNAMSIZ ) >=IFNAMSIZ )strcpy (tname,"mangle" ); t =kmemdup (td, td->u.target_size,GFP_KERNEL );
net/sched/act_simple.c +2 -2
@@ -52,7 +52,7 @@ static int alloc_defdata(struct tcf_defact *d, const struct nlattr *defdata) d->tcfd_defdata =kzalloc (SIMP_MAX_DATA ,GFP_KERNEL );if (unlikely (!d->tcfd_defdata))return -ENOMEM ; -nla_strlcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA ); +nla_strcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA );return 0 ; }
@@ -71,7 +71,7 @@ static int reset_policy(struct tc_action *a, const struct nlattr *defdata,spin_lock_bh (&d->tcf_lock); goto_ch =tcf_action_set_ctrlact (a, p->action, goto_ch);memset (d->tcfd_defdata,0 ,SIMP_MAX_DATA ); -nla_strlcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA ); +nla_strcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA );spin_unlock_bh (&d->tcf_lock);if (goto_ch)tcf_chain_put_by_act (goto_ch);
net/sched/cls_api.c +1 -1
@@ -223,7 +223,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)static bool tcf_proto_check_kind (struct nlattr *kind,char *name) {if (kind) -return nla_strlcpy (name, kind,IFNAMSIZ ) >=IFNAMSIZ ; +return nla_strcpy (name, kind,IFNAMSIZ ) >=IFNAMSIZ ;memset (name,0 ,IFNAMSIZ );return false; }
net/sched/sch_api.c +1 -1
@@ -1170,7 +1170,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,#ifdef CONFIG_MODULES if (ops ==NULL && kind !=NULL ) {char name[IFNAMSIZ ]; -if (nla_strlcpy (name, kind,IFNAMSIZ ) != -E2BIG ) { +if (nla_strcpy (name, kind,IFNAMSIZ ) != -E2BIG ) {/* We dropped the RTNL semaphore in order to * perform the module load. So, even if we * succeeded in loading the module we have to
net/tipc/netlink_compat.c +1 -1
@@ -695,7 +695,7 @@ static int tipc_nl_compat_link_dump(struct tipc_nl_compat_msg *msg, link_info.dest =nla_get_flag (link[TIPC_NLA_LINK_DEST ]); link_info.up =htonl (nla_get_flag (link[TIPC_NLA_LINK_UP ])); -nla_strlcpy (link_info.str, link[TIPC_NLA_LINK_NAME ], +nla_strcpy (link_info.str, link[TIPC_NLA_LINK_NAME ],TIPC_MAX_LINK_NAME ); return tipc_add_tlv(msg->rep, TIPC_TLV_LINK_INFO,
Signature · 1 line
2.20.1
Re: [PATCH v1 3/3] Rename nla_strlcpy to nla_strcpy.
Quoted 3 lines · On Fri, Oct 16, 2020 at 02:52:16PM +0200, [email protected]…
From: Francis Laniel <[email protected]>
This patch solves part 3 of issue: https://github.com/KSPP/linux/issues/110
This needs a full commit log, but is straight forward. :) One note below...
Quoted 79 lines
Signed-off-by Francis Laniel <[email protected]>--- drivers/infiniband/core/nldev.c | 10 +++++----- drivers/misc/lkdtm/Makefile | 1 + 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 | 6 +++--- 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 +- 30 files changed, 50 insertions(+), 49 deletions(-)drivers/infiniband/core/nldev.c +5
-5@@ -932,7 +932,7 @@ static int nldev_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh,if (tb[RDMA_NLDEV_ATTR_DEV_NAME ]) {char name[IB_DEVICE_NAME_MAX ] = {}; -nla_strlcpy (name, tb[RDMA_NLDEV_ATTR_DEV_NAME ], +nla_strcpy (name, tb[RDMA_NLDEV_ATTR_DEV_NAME ],IB_DEVICE_NAME_MAX );if (strlen (name) ==0 ) { err = -EINVAL ;@@ -1529,13 +1529,13 @@ static int nldev_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, !tb[RDMA_NLDEV_ATTR_LINK_TYPE] || !tb[RDMA_NLDEV_ATTR_NDEV_NAME])return -EINVAL ; -nla_strlcpy (ibdev_name, tb[RDMA_NLDEV_ATTR_DEV_NAME ], +nla_strcpy (ibdev_name, tb[RDMA_NLDEV_ATTR_DEV_NAME ],sizeof (ibdev_name));if (strchr (ibdev_name,'%' ) ||strlen (ibdev_name) ==0 )return -EINVAL ; -nla_strlcpy (type, tb[RDMA_NLDEV_ATTR_LINK_TYPE ],sizeof (type)); -nla_strlcpy (ndev_name, tb[RDMA_NLDEV_ATTR_NDEV_NAME ], +nla_strcpy (type, tb[RDMA_NLDEV_ATTR_LINK_TYPE ],sizeof (type)); +nla_strcpy (ndev_name, tb[RDMA_NLDEV_ATTR_NDEV_NAME ],sizeof (ndev_name)); ndev =dev_get_by_name (sock_net (skb->sk), ndev_name);@@ -1602,7 +1602,7 @@ static int nldev_get_chardev(struct sk_buff *skb, struct nlmsghdr *nlh,if (err || !tb[RDMA_NLDEV_ATTR_CHARDEV_TYPE ])return -EINVAL ; -nla_strlcpy (client_name, tb[RDMA_NLDEV_ATTR_CHARDEV_TYPE ], +nla_strcpy (client_name, tb[RDMA_NLDEV_ATTR_CHARDEV_TYPE ],sizeof (client_name));if (tb[RDMA_NLDEV_ATTR_DEV_INDEX ]) {drivers/misc/lkdtm/Makefile +0
-0
drivers/misc/lkdtm/Makefile lkdtm-$(CONFIG_LKDTM) += rodata_objcopy.o · line 13
Quoted 4 lines
drivers/misc/lkdtm/Makefile +1
-0@@ -10,6 +10,7 @@ lkdtm-$(CONFIG_LKDTM) += rodata_objcopy.o lkdtm-$(CONFIG_LKDTM) += usercopy.o lkdtm-$(CONFIG_LKDTM) += stackleak.o lkdtm-$(CONFIG_LKDTM) += cfi.o +lkdtm-$(CONFIG_LKDTM) += fortify.o
I think this sneaked its way into the wrong patch. ;)
Quoted 508 lines
drivers/misc/lkdtm/Makefile +0
-0KASAN_SANITIZE_stackleak.o := n KCOV_INSTRUMENT_rodata.o := ndrivers/net/can/vxcan.c +2
-2@@ -186,7 +186,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, }if (ifmp && tbp[IFLA_IFNAME ]) { -nla_strlcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); name_assign_type =NET_NAME_USER ; }else {snprintf (ifname,IFNAMSIZ ,DRV_NAME "%%d" );@@ -223,7 +223,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,/* register first device */ if (tb[IFLA_IFNAME ]) -nla_strlcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ );else snprintf (dev->name,IFNAMSIZ ,DRV_NAME "%%d" );drivers/net/veth.c +2
-2@@ -1329,7 +1329,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, }if (ifmp && tbp[IFLA_IFNAME ]) { -nla_strlcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); name_assign_type =NET_NAME_USER ; }else {snprintf (ifname,IFNAMSIZ ,DRV_NAME "%%d" );@@ -1379,7 +1379,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,eth_hw_addr_random (dev);if (tb[IFLA_IFNAME ]) -nla_strlcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ );else snprintf (dev->name,IFNAMSIZ ,DRV_NAME "%%d" );include/linux/genl_magic_struct.h +1
-1@@ -89,7 +89,7 @@ static inline int nla_put_u64_0pad(struct sk_buff *skb, int attrtype, u64 value) nla_get_u64, nla_put_u64_0pad, false)#define __str_field (attr_nr, attr_flag, name, maxlen) \ __array(attr_nr, attr_flag, name, NLA_NUL_STRING, char, maxlen, \ - nla_strlcpy, nla_put, false) + nla_strcpy, nla_put, false)#define __bin_field (attr_nr, attr_flag, name, maxlen) \ __array(attr_nr, attr_flag, name, NLA_BINARY, char, maxlen, \ nla_memcpy, nla_put, false)include/net/netlink.h +2
-2@@ -142,7 +142,7 @@* Attribute Misc: * nla_memcpy(dest, nla, count) copy attribute into memory * nla_memcmp(nla, data, size) compare attribute with memory area -* nla_strlcpy(dst, nla, size) copy attribute to a sized string +* nla_strcpy(dst, nla, size) copy attribute to a sized string * nla_strcmp(nla, str) compare attribute with string * * Attribute Parsing: @@ -506,7 +506,7 @@ int __nla_parse(struct nlattr **tb, int maxtype, const struct nlattr *head, struct netlink_ext_ack *extack);int nla_policy_len (const struct nla_policy *,int );struct nlattr *nla_find (const struct nlattr *head,int len,int attrtype); -ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize); +ssize_t nla_strcpy (char *dst,const struct nlattr *nla,size_t dstsize);char *nla_strdup (const struct nlattr *nla,gfp_t flags);int nla_memcpy (void *dest,const struct nlattr *src,int count);int nla_memcmp (const struct nlattr *nla,const void *data,size_t size);include/net/pkt_cls.h +1
-1@@ -513,7 +513,7 @@ tcf_change_indev(struct net *net, struct nlattr *indev_tlv,char indev[IFNAMSIZ ];struct net_device *dev; -if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) == -E2BIG ) { +if (nla_strcpy (indev, indev_tlv,IFNAMSIZ ) == -E2BIG ) {NL_SET_ERR_MSG_ATTR (extack, indev_tlv,"Interface name too long" );return -EINVAL ;kernel/taskstats.c +1
-1@@ -346,7 +346,7 @@ static int parse(struct nlattr *na, struct cpumask *mask) data =kmalloc (len,GFP_KERNEL );if (!data)return -ENOMEM ; -nla_strlcpy (data, na, len); +nla_strcpy (data, na, len); ret =cpulist_parse (data, mask);kfree (data);return ret;lib/nlattr.c +3
-3@@ -709,7 +709,7 @@ struct nlattr *nla_find(const struct nlattr *head, int len, int attrtype)EXPORT_SYMBOL (nla_find);/** -* nla_strlcpy - Copy string attribute payload into a sized buffer +* nla_strcpy - Copy string attribute payload into a sized buffer * @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer @@ -720,7 +720,7 @@ EXPORT_SYMBOL(nla_find);* Copies at most dstsize - 1 bytes into the destination buffer. * The result is always a valid NUL-terminated string. */ -ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strcpy (char *dst,const struct nlattr *nla,size_t dstsize) {size_t len;ssize_t ret;@@ -746,7 +746,7 @@ ssize_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)return ret; } -EXPORT_SYMBOL (nla_strlcpy); +EXPORT_SYMBOL (nla_strcpy);/** * nla_strdup - Copy string attribute payload into a newly allocated buffer net/core/fib_rules.c +2
-2@@ -563,7 +563,7 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,struct net_device *dev; nlrule->iifindex =-1 ; -nla_strlcpy (nlrule->iifname, tb[FRA_IIFNAME ],IFNAMSIZ ); +nla_strcpy (nlrule->iifname, tb[FRA_IIFNAME ],IFNAMSIZ ); dev =__dev_get_by_name (net, nlrule->iifname);if (dev) nlrule->iifindex = dev->ifindex;@@ -573,7 +573,7 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,struct net_device *dev; nlrule->oifindex =-1 ; -nla_strlcpy (nlrule->oifname, tb[FRA_OIFNAME ],IFNAMSIZ ); +nla_strcpy (nlrule->oifname, tb[FRA_OIFNAME ],IFNAMSIZ ); dev =__dev_get_by_name (net, nlrule->oifname);if (dev) nlrule->oifindex = dev->ifindex;net/core/rtnetlink.c +6
-6@@ -1939,7 +1939,7 @@ static const struct rtnl_link_ops *linkinfo_to_kind_ops(const struct nlattr *nlaif (linfo[IFLA_INFO_KIND ]) {char kind[MODULE_NAME_LEN ]; -nla_strlcpy (kind, linfo[IFLA_INFO_KIND ],sizeof (kind)); +nla_strcpy (kind, linfo[IFLA_INFO_KIND ],sizeof (kind)); ops =rtnl_link_ops_get (kind); }@@ -2953,9 +2953,9 @@ static struct net_device *rtnl_dev_get(struct net *net,if (!ifname) { ifname = buffer;if (ifname_attr) -nla_strlcpy (ifname, ifname_attr,IFNAMSIZ ); +nla_strcpy (ifname, ifname_attr,IFNAMSIZ );else if (altifname_attr) -nla_strlcpy (ifname, altifname_attr,ALTIFNAMSIZ ); +nla_strcpy (ifname, altifname_attr,ALTIFNAMSIZ );else return NULL ; }@@ -2983,7 +2983,7 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, goto errout;if (tb[IFLA_IFNAME ]) -nla_strlcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ );else ifname[0 ] ='\0' ;@@ -3264,7 +3264,7 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,return err;if (tb[IFLA_IFNAME ]) -nla_strlcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ );else ifname[0 ] ='\0' ;@@ -3296,7 +3296,7 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,memset (linkinfo,0 ,sizeof (linkinfo));if (linkinfo[IFLA_INFO_KIND ]) { -nla_strlcpy (kind, linkinfo[IFLA_INFO_KIND ],sizeof (kind)); +nla_strcpy (kind, linkinfo[IFLA_INFO_KIND ],sizeof (kind)); ops =rtnl_link_ops_get (kind); }else { kind[0 ] ='\0' ;net/decnet/dn_dev.c +1
-1@@ -658,7 +658,7 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, ifa->ifa_dev = dn_db;if (tb[IFA_LABEL ]) -nla_strlcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ ); +nla_strcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ );else memcpy (ifa->ifa_label, dev->name,IFNAMSIZ );net/ieee802154/nl-mac.c +1
-1@@ -149,7 +149,7 @@ static struct net_device *ieee802154_nl_get_dev(struct genl_info *info)if (info->attrs[IEEE802154_ATTR_DEV_NAME ]) {char name[IFNAMSIZ +1 ]; -nla_strlcpy (name, info->attrs[IEEE802154_ATTR_DEV_NAME ], +nla_strcpy (name, info->attrs[IEEE802154_ATTR_DEV_NAME ],sizeof (name)); dev =dev_get_by_name (&init_net, name); }else if (info->attrs[IEEE802154_ATTR_DEV_INDEX ]) {net/ipv4/devinet.c +1
-1@@ -881,7 +881,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, ifa->ifa_broadcast =nla_get_in_addr (tb[IFA_BROADCAST ]);if (tb[IFA_LABEL ]) -nla_strlcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ ); +nla_strcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ );else memcpy (ifa->ifa_label, dev->name,IFNAMSIZ );net/ipv4/fib_semantics.c +1
-1@@ -973,7 +973,7 @@ bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi)char tmp[TCP_CA_NAME_MAX ];bool ecn_ca = false; -nla_strlcpy (tmp, nla,sizeof (tmp)); +nla_strcpy (tmp, nla,sizeof (tmp)); val =tcp_ca_get_key_by_name (fi->fib_net, tmp, &ecn_ca); }else {if (nla_len (nla) !=sizeof (u32))net/ipv4/metrics.c +1
-1@@ -31,7 +31,7 @@ static int ip_metrics_convert(struct net *net, struct nlattr *fc_mx,if (type ==RTAX_CC_ALGO ) {char tmp[TCP_CA_NAME_MAX ]; -nla_strlcpy (tmp, nla,sizeof (tmp)); +nla_strcpy (tmp, nla,sizeof (tmp)); val =tcp_ca_get_key_by_name (net, tmp, &ecn_ca);if (val ==TCP_CA_UNSPEC ) {NL_SET_ERR_MSG (extack,"Unknown tcp congestion algorithm" );net/netfilter/ipset/ip_set_hash_netiface.c +2
-2@@ -225,7 +225,7 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],if (e.cidr >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; } -nla_strlcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ ); +nla_strcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ );if (tb[IPSET_ATTR_CADT_FLAGS ]) {u32 cadt_flags =ip_set_get_h32 (tb[IPSET_ATTR_CADT_FLAGS ]);@@ -442,7 +442,7 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[],ip6_netmask (&e.ip, e.cidr); -nla_strlcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ ); +nla_strcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ );if (tb[IPSET_ATTR_CADT_FLAGS ]) {u32 cadt_flags =ip_set_get_h32 (tb[IPSET_ATTR_CADT_FLAGS ]);net/netfilter/nf_tables_api.c +3
-3@@ -1281,7 +1281,7 @@ static struct nft_chain *nft_chain_lookup(struct net *net,if (nla ==NULL )return ERR_PTR (-EINVAL ); -nla_strlcpy (search, nla,sizeof (search)); +nla_strcpy (search, nla,sizeof (search));WARN_ON (!rcu_read_lock_held () && !lockdep_commit_lock_is_held (net));@@ -1721,7 +1721,7 @@ static struct nft_hook *nft_netdev_hook_alloc(struct net *net, goto err_hook_alloc; } -nla_strlcpy (ifname, attr,IFNAMSIZ ); +nla_strcpy (ifname, attr,IFNAMSIZ ); dev =__dev_get_by_name (net, ifname);if (!dev) { err = -ENOENT ;@@ -5734,7 +5734,7 @@ struct nft_object *nft_obj_lookup(const struct net *net,struct rhlist_head *tmp, *list;struct nft_object *obj; -nla_strlcpy (search, nla,sizeof (search)); +nla_strcpy (search, nla,sizeof (search)); k.name = search; WARN_ON_ONCE(!rcu_read_lock_held() &&net/netfilter/nfnetlink_acct.c +1
-1@@ -112,7 +112,7 @@ static int nfnl_acct_new(struct net *net, struct sock *nfnl, nfacct->flags = flags; } -nla_strlcpy (nfacct->name, tb[NFACCT_NAME ],NFACCT_NAME_MAX ); +nla_strcpy (nfacct->name, tb[NFACCT_NAME ],NFACCT_NAME_MAX );if (tb[NFACCT_BYTES ]) { atomic64_set(&nfacct->bytes,net/netfilter/nfnetlink_cthelper.c +2
-2@@ -146,7 +146,7 @@ nfnl_cthelper_expect_policy(struct nf_conntrack_expect_policy *expect_policy, !tb[NFCTH_POLICY_EXPECT_TIMEOUT])return -EINVAL ; -nla_strlcpy (expect_policy->name, +nla_strcpy (expect_policy->name, tb[NFCTH_POLICY_NAME ],NF_CT_HELPER_NAME_LEN ); expect_policy->max_expected =ntohl (nla_get_be32 (tb[NFCTH_POLICY_EXPECT_MAX ]));@@ -233,7 +233,7 @@ nfnl_cthelper_create(const struct nlattr * const tb[],if (ret <0 ) goto err1; -nla_strlcpy (helper->name, +nla_strcpy (helper->name, tb[NFCTH_NAME ],NF_CT_HELPER_NAME_LEN ); size =ntohl (nla_get_be32 (tb[NFCTH_PRIV_DATA_LEN ])); if (size > sizeof_field(struct nf_conn_help, data)) {net/netfilter/nft_ct.c +1
-1@@ -990,7 +990,7 @@ static int nft_ct_helper_obj_init(const struct nft_ctx *ctx,if (!priv->l4proto)return -ENOENT ; -nla_strlcpy (name, tb[NFTA_CT_HELPER_NAME ],sizeof (name)); +nla_strcpy (name, tb[NFTA_CT_HELPER_NAME ],sizeof (name));if (tb[NFTA_CT_HELPER_L3PROTO ]) family =ntohs (nla_get_be16 (tb[NFTA_CT_HELPER_L3PROTO ]));net/netfilter/nft_log.c +1
-1@@ -152,7 +152,7 @@ static int nft_log_init(const struct nft_ctx *ctx, priv->prefix =kmalloc (nla_len (nla) +1 ,GFP_KERNEL );if (priv->prefix ==NULL )return -ENOMEM ; -nla_strlcpy (priv->prefix, nla,nla_len (nla) +1 ); +nla_strcpy (priv->prefix, nla,nla_len (nla) +1 ); }else { priv->prefix = (char *)nft_log_null_prefix; }net/netlabel/netlabel_mgmt.c +1
-1@@ -95,7 +95,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info, ret_val = -ENOMEM ; goto add_free_entry; } -nla_strlcpy (entry->domain, +nla_strcpy (entry->domain, info->attrs[NLBL_MGMT_A_DOMAIN ], tmp_size); }net/nfc/netlink.c +1
-1@@ -1226,7 +1226,7 @@ static int nfc_genl_fw_download(struct sk_buff *skb, struct genl_info *info)if (!dev)return -ENODEV ; -nla_strlcpy (firmware_name, info->attrs[NFC_ATTR_FIRMWARE_NAME ], +nla_strcpy (firmware_name, info->attrs[NFC_ATTR_FIRMWARE_NAME ],sizeof (firmware_name)); rc =nfc_fw_download (dev, firmware_name);net/sched/act_api.c +1
-1@@ -935,7 +935,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,NL_SET_ERR_MSG (extack,"TC action kind must be specified" ); goto err_out; } -if (nla_strlcpy (act_name, kind,IFNAMSIZ ) == -E2BIG ) { +if (nla_strcpy (act_name, kind,IFNAMSIZ ) == -E2BIG ) {NL_SET_ERR_MSG (extack,"TC action name too long" ); goto err_out; }net/sched/act_ipt.c +1
-1@@ -166,7 +166,7 @@ static int __tcf_ipt_init(struct net *net, unsigned int id, struct nlattr *nla,if (unlikely (!tname)) goto err1;if (tb[TCA_IPT_TABLE ] ==NULL || -nla_strlcpy (tname, tb[TCA_IPT_TABLE ],IFNAMSIZ ) >=IFNAMSIZ ) +nla_strcpy (tname, tb[TCA_IPT_TABLE ],IFNAMSIZ ) >=IFNAMSIZ )strcpy (tname,"mangle" ); t =kmemdup (td, td->u.target_size,GFP_KERNEL );net/sched/act_simple.c +2
-2@@ -52,7 +52,7 @@ static int alloc_defdata(struct tcf_defact *d, const struct nlattr *defdata) d->tcfd_defdata =kzalloc (SIMP_MAX_DATA ,GFP_KERNEL );if (unlikely (!d->tcfd_defdata))return -ENOMEM ; -nla_strlcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA ); +nla_strcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA );return 0 ; }@@ -71,7 +71,7 @@ static int reset_policy(struct tc_action *a, const struct nlattr *defdata,spin_lock_bh (&d->tcf_lock); goto_ch =tcf_action_set_ctrlact (a, p->action, goto_ch);memset (d->tcfd_defdata,0 ,SIMP_MAX_DATA ); -nla_strlcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA ); +nla_strcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA );spin_unlock_bh (&d->tcf_lock);if (goto_ch)tcf_chain_put_by_act (goto_ch);net/sched/cls_api.c +1
-1@@ -223,7 +223,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)static bool tcf_proto_check_kind (struct nlattr *kind,char *name) {if (kind) -return nla_strlcpy (name, kind,IFNAMSIZ ) >=IFNAMSIZ ; +return nla_strcpy (name, kind,IFNAMSIZ ) >=IFNAMSIZ ;memset (name,0 ,IFNAMSIZ );return false; }net/sched/sch_api.c +1
-1@@ -1170,7 +1170,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,#ifdef CONFIG_MODULES if (ops ==NULL && kind !=NULL ) {char name[IFNAMSIZ ]; -if (nla_strlcpy (name, kind,IFNAMSIZ ) != -E2BIG ) { +if (nla_strcpy (name, kind,IFNAMSIZ ) != -E2BIG ) {/* We dropped the RTNL semaphore in order to * perform the module load. So, even if we * succeeded in loading the module we have to net/tipc/netlink_compat.c +1
-1@@ -695,7 +695,7 @@ static int tipc_nl_compat_link_dump(struct tipc_nl_compat_msg *msg, link_info.dest =nla_get_flag (link[TIPC_NLA_LINK_DEST ]); link_info.up =htonl (nla_get_flag (link[TIPC_NLA_LINK_UP ])); -nla_strlcpy (link_info.str, link[TIPC_NLA_LINK_NAME ], +nla_strcpy (link_info.str, link[TIPC_NLA_LINK_NAME ],TIPC_MAX_LINK_NAME ); return tipc_add_tlv(msg->rep, TIPC_TLV_LINK_INFO,Signature · 1 line
2.20.1
Signature · 1 line
Kees Cook
v2 cover Fix inefficiences and rename nla_strlcpy
In reply to [email protected]From: Francis Laniel <[email protected]>
Hi.
I hope your families, friends and yourselves are fine.
This patch set answers to first three issues listed in:
https://github.com/KSPP/linux/issues/110
To sum up, the first patch fixes an inefficiency where some bytes in dst were written twice, one with 0 the other with src content.
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.
The third rename nla_strlcpy to nla_strcpy.
Unfortunately, I did not find how to create struct nlattr objects so I tested my modifications on simple char*.
This is why I tag this patch set as RFC.
If you see any way to improve the code or have any remark, feel free to comment.
Best regards.
Francis Laniel (3):
Fix unefficient call to memset before memcpu in nla_strlcpy. Modify return value of nla_strlcpy to match that of strscpy. Rename nla_strlcpy to nla_strcpy.
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 | 3 +- kernel/taskstats.c | 2 +- lib/nlattr.c | 36 ++++++++++++++-------- 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, 70 insertions(+), 59 deletions(-)
Signature · 1 line
2.20.1
RFC PATCH v2 1/3 Fix unefficient call to memset before memcpu in nla_strlcpy.
From: Francis Laniel <[email protected]>
Before this commit, nla_strlcpy first memseted dst to 0 then wrote src into it. This is inefficient because bytes whom number is less than src length are written twice.
This patch solves this issue by first writing src into dst then fill dst with 0's.
Note that, in the case where src length is higher than dst, only 0 is written. Otherwise there are as many 0's written to fill dst.
For example, if src is "foo\0" and dst is 5 bytes long, the result will be:
1. "fooGG" after memcpy (G means garbage).
2. "foo\0\0" after memset.
--- lib/nlattr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/nlattr.c +2 -1
@@ -731,8 +731,9 @@ size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)if (dstsize >0 ) {size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; -memset (dst,0 , dstsize);memcpy (dst, src, len); +/* Zero pad end of dst. */ +memset (dst + len,0 , dstsize - len); }return srclen;
Signature · 1 line
2.20.1
RFC PATCH v2 2/3 Modify return value of nla_strlcpy to match that of strscpy.
In reply to [email protected]From: Francis Laniel <[email protected]>
nla_strlcpy now returns -E2BIG if src was truncated when written to dst. It also returns this error value if dstsize is 0 or higher than INT_MAX.
For example, if src is "foo\0" and dst is 3 bytes long, the result will be:
1. "foG" after memcpy (G means garbage).
2. "fo\0" after memset.
3. -E2BIG is returned because src was not completely written into dst.
The callers of nla_strlcpy were modified to take into account this modification.
--- include/net/netlink.h | 2 +- include/net/pkt_cls.h | 3 ++- lib/nlattr.c | 33 +++++++++++++++++++++------------ net/sched/act_api.c | 2 +- net/sched/cls_api.c | 2 +- net/sched/sch_api.c | 2 +- 6 files changed, 27 insertions(+), 17 deletions(-)
include/net/netlink.h +1 -1
@@ -506,7 +506,7 @@ int __nla_parse(struct nlattr **tb, int maxtype, const struct nlattr *head, struct netlink_ext_ack *extack);int nla_policy_len (const struct nla_policy *,int );struct nlattr *nla_find (const struct nlattr *head,int len,int attrtype); -size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize); +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize);char *nla_strdup (const struct nlattr *nla,gfp_t flags);int nla_memcpy (void *dest,const struct nlattr *src,int count);int nla_memcmp (const struct nlattr *nla,const void *data,size_t size);
include/net/pkt_cls.h +2 -1
@@ -4,6 +4,7 @@#include <linux/pkt_cls.h> #include <linux/workqueue.h> +#include <linux/errno.h> #include <net/sch_generic.h> #include <net/act_api.h> #include <net/net_namespace.h>
@@ -512,7 +513,7 @@ tcf_change_indev(struct net *net, struct nlattr *indev_tlv,char indev[IFNAMSIZ ];struct net_device *dev; -if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) >=IFNAMSIZ ) { +if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) <0 ) {NL_SET_ERR_MSG_ATTR (extack, indev_tlv,"Interface name too long" );return -EINVAL ;
lib/nlattr.c +21 -12
@@ -713,30 +713,39 @@ EXPORT_SYMBOL(nla_find);* @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer +* @returns: -E2BIG if @dstsize is 0 or source buffer length greater than +* @dstsize, otherwise it returns the number of copied characters (not +* including the trailing %NUL). * * Copies at most dstsize - 1 bytes into the destination buffer. -* The result is always a valid NUL-terminated string. Unlike -* strlcpy the destination buffer is always padded out. -* -* Returns the length of the source buffer. +* Unlike strlcpy the destination buffer is always padded out. */ -size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) { +size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla); +if (dstsize ==0 ||WARN_ON_ONCE (dstsize >INT_MAX )) +return -E2BIG ; +if (srclen >0 && src[srclen -1 ] =='\0' ) srclen--; -if (dstsize >0 ) { -size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; - -memcpy (dst, src, len); -/* Zero pad end of dst. */ -memset (dst + len,0 , dstsize - len); +if (srclen >= dstsize) { + len = dstsize -1 ; + ret = -E2BIG ; + }else { + len = srclen; + ret = len; } -return srclen; +memcpy (dst, src, len); +/* Zero pad end of dst. */ +memset (dst + len,0 , dstsize - len); + +return ret; }EXPORT_SYMBOL (nla_strlcpy);
net/sched/act_api.c +1 -1
@@ -935,7 +935,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,NL_SET_ERR_MSG (extack,"TC action kind must be specified" ); goto err_out; } -if (nla_strlcpy (act_name, kind,IFNAMSIZ ) >=IFNAMSIZ ) { +if (nla_strlcpy (act_name, kind,IFNAMSIZ ) <0 ) {NL_SET_ERR_MSG (extack,"TC action name too long" ); goto err_out; }
net/sched/cls_api.c +1 -1
@@ -223,7 +223,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)static bool tcf_proto_check_kind (struct nlattr *kind,char *name) {if (kind) -return nla_strlcpy (name, kind,IFNAMSIZ ) >=IFNAMSIZ ; +return nla_strlcpy (name, kind,IFNAMSIZ ) >0 ;memset (name,0 ,IFNAMSIZ );return false; }
net/sched/sch_api.c +1 -1
@@ -1170,7 +1170,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,#ifdef CONFIG_MODULES if (ops ==NULL && kind !=NULL ) {char name[IFNAMSIZ ]; -if (nla_strlcpy (name, kind,IFNAMSIZ ) <IFNAMSIZ ) { +if (nla_strlcpy (name, kind,IFNAMSIZ ) >0 ) {/* We dropped the RTNL semaphore in order to * perform the module load. So, even if we * succeeded in loading the module we have to
Signature · 1 line
2.20.1
Jakub Kicinski
maintainerRe: [RFC][PATCH v2 2/3] Modify return value of nla_strlcpy to match that of strscpy.
include/net/pkt_cls.h line 7
Quoted 9 lines · On Mon, 19 Oct 2020 17:23:30 +0200 [email protected] wrote:
include/net/pkt_cls.h +1
-0@@ -4,6 +4,7 @@#include <linux/pkt_cls.h> #include <linux/workqueue.h> +#include <linux/errno.h>
Stray include.
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 716
Quoted 12 lines
include/net/pkt_cls.h +0
-0#include <net/sch_generic.h> #include <net/act_api.h> #include <net/net_namespace.h> lib/nlattr.c +1
-0@@ -713,30 +713,39 @@ EXPORT_SYMBOL(nla_find);* @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer +* @returns: -E2BIG if @dstsize is 0 or source buffer length greater than
I don't think this is correct format for kdoc.
Quoted 7 lines
lib/nlattr.c +2
-3+* @dstsize, otherwise it returns the number of copied characters (not +* including the trailing %NUL). * * Copies at most dstsize - 1 bytes into the destination buffer. -* The result is always a valid NUL-terminated string. Unlike -* strlcpy the destination buffer is always padded out. -*
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 728
Quoted 10 lines
lib/nlattr.c +4
-2-* Returns the length of the source buffer. +* Unlike strlcpy the destination buffer is always padded out. */ -size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) { +size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla);
Sort local variables long to short.
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 730
Quoted 2 lines
lib/nlattr.c +1
-0+if (dstsize ==0 ||WARN_ON_ONCE (dstsize >INT_MAX ))
You can make it > U16_MAX, attr len is 16 bit.
Quoted 34 lines
lib/nlattr.c +13
-7+return -E2BIG ; +if (srclen >0 && src[srclen -1 ] =='\0' ) srclen--; -if (dstsize >0 ) { -size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; - -memcpy (dst, src, len); -/* Zero pad end of dst. */ -memset (dst + len,0 , dstsize - len); +if (srclen >= dstsize) { + len = dstsize -1 ; + ret = -E2BIG ; + }else { + len = srclen; + ret = len; } -return srclen; +memcpy (dst, src, len); +/* Zero pad end of dst. */ +memset (dst + len,0 , dstsize - len); + +return ret; }EXPORT_SYMBOL (nla_strlcpy);net/sched/cls_api.c +0
-0
net/sched/cls_api.c static inline u32 tcf_auto_prio(struct tcf_proto *tp) · line 226
Quoted 5 lines
net/sched/cls_api.c +1
-1@@ -223,7 +223,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)static bool tcf_proto_check_kind (struct nlattr *kind,char *name) {if (kind) -return nla_strlcpy (name, kind,IFNAMSIZ ) >=IFNAMSIZ ; +return nla_strlcpy (name, kind,IFNAMSIZ ) >0 ;
Bug.
Quoted 3 lines
net/sched/cls_api.c +0
-0memset (name,0 ,IFNAMSIZ );return false; }
Re: [RFC][PATCH v2 2/3] Modify return value of nla_strlcpy to match that of strscpy.
Quoted 11 lines · Jakub Kicinski
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 728
Quoted 7 lines · On Mon, 19 Oct 2020 17:23:30 +0200 [email protected] wrote:
lib/nlattr.c +3
-1-size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) { +size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla);Sort local variables long to short.
Specifically, "reverse christmas tree":
size_t srclen = nla_len(nla);
char *src = nla_data(nla);
size_t len;
ssize_t ret;
Quoted 4 lines
Quoted 4 lines
net/sched/cls_api.c +0
-0
Quoted 12 lines
net/sched/cls_api.c static inline u32 tcf_auto_prio(struct tcf_proto *tp) · line 226
Quoted 6 lines
net/sched/cls_api.c +1
-1@@ -223,7 +223,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)static bool tcf_proto_check_kind (struct nlattr *kind,char *name) {if (kind) -return nla_strlcpy (name, kind,IFNAMSIZ ) >=IFNAMSIZ ; +return nla_strlcpy (name, kind,IFNAMSIZ ) >0 ;Bug.
Quoted 3 lines
net/sched/cls_api.c +0
-0memset (name,0 ,IFNAMSIZ );return false; }
Have you been able to exercise the changed code paths? (I would have expected this to immediately fail, for example.)
Signature · 1 line
Kees Cook
Jakub Kicinski
maintainerRe: [RFC][PATCH v2 2/3] Modify return value of nla_strlcpy to match that of strscpy.
Quoted 15 lines · On Mon, 19 Oct 2020 16:01:27 -0700 Kees Cook wrote:
Quoted 11 lines · Jakub Kicinski
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 728
Quoted 7 lines · On Mon, 19 Oct 2020 17:23:30 +0200 [email protected] wrote:
lib/nlattr.c +3
-1-size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) { +size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla);Sort local variables long to short.
Specifically, "reverse christmas tree":
lib/nlattr.c EXPORT_SYMBOL(nla_find);
Quoted 4 lines
lib/nlattr.c +0
-0size_t srclen =nla_len (nla);char *src =nla_data (nla);size_t len;ssize_t ret;
Or even
size_t srclen = nla_len(nla);
char *src = nla_data(nla);
ssize_t ret;
size_t len;
;)
Re: [RFC][PATCH v2 2/3] Modify return value of nla_strlcpy to match that of strscpy.
Quoted 33 lines · Le mardi 20 octobre 2020, 01:34:49 CEST Jakub Kicinski a écrit :
Quoted 20 lines · On Mon, 19 Oct 2020 16:01:27 -0700 Kees Cook wrote:
Quoted 10 lines · Jakub Kicinski
On Mon, 19 Oct 2020 17:23:30 +0200 [email protected]
Quoted 7 lines · wrote:
-size_t
nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)
+ssize_tnla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize){
Quoted 7 lines
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 728
Quoted 5 lines
lib/nlattr.c +2
-0+size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla);Sort local variables long to short.
Specifically, "reverse christmas tree":
lib/nlattr.c EXPORT_SYMBOL(nla_find);
Quoted 4 lines
lib/nlattr.c +0
-0size_t srclen =nla_len (nla);char *src =nla_data (nla);size_t len;ssize_t ret;Or even
lib/nlattr.c +0
-0size_t srclen =nla_len (nla);char *src =nla_data (nla);ssize_t ret;size_t len;
Quoted 1 line
;)
I reordered the variables names for the v3.
Just to know, is it a new rule? Because scripts/checkpatch.pl did not report anything and I was not aware of it.
Re: [RFC][PATCH v2 2/3] Modify return value of nla_strlcpy to match that of strscpy.
Quoted 34 lines · Francis Laniel
Quoted 33 lines · Le mardi 20 octobre 2020, 01:34:49 CEST Jakub Kicinski a écrit :
Quoted 20 lines · On Mon, 19 Oct 2020 16:01:27 -0700 Kees Cook wrote:
Quoted 10 lines · Jakub Kicinski
On Mon, 19 Oct 2020 17:23:30 +0200 [email protected]
Quoted 7 lines · wrote:
-size_t
nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)
+ssize_tnla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize){
Quoted 7 lines
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 728
Quoted 5 lines
lib/nlattr.c +2
-0+size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla);Sort local variables long to short.
Specifically, "reverse christmas tree":
lib/nlattr.c EXPORT_SYMBOL(nla_find);
Quoted 4 lines
lib/nlattr.c +0
-0size_t srclen =nla_len (nla);char *src =nla_data (nla);size_t len;ssize_t ret;Or even
lib/nlattr.c +0
-0size_t srclen =nla_len (nla);char *src =nla_data (nla);ssize_t ret;size_t len;
Quoted 5 lines
Quoted 1 line
;)
I reordered the variables names for the v3.
Just to know, is it a new rule? Becausescripts/checkpatch.pldid not report anything and I was not aware of it.
This is specific to netdev, but I actually can't find reference to this in either Documentation/process/coding-style.rst nor Documentation/networking/netdev-FAQ.rst.
I swear I found this written down before, but it eludes me now.
Signature · 1 line
Kees Cook
Re: [RFC][PATCH v2 2/3] Modify return value of nla_strlcpy to match that of strscpy.
In reply to Jakub KicinskiQuoted 28 lines · Jakub Kicinski
Quoted 15 lines · On Mon, 19 Oct 2020 16:01:27 -0700 Kees Cook wrote:
Quoted 11 lines · Jakub Kicinski
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 728
Quoted 7 lines · On Mon, 19 Oct 2020 17:23:30 +0200 [email protected] wrote:
lib/nlattr.c +3
-1-size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) { +size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla);Sort local variables long to short.
Specifically, "reverse christmas tree":
lib/nlattr.c EXPORT_SYMBOL(nla_find);
Quoted 4 lines
lib/nlattr.c +0
-0size_t srclen =nla_len (nla);char *src =nla_data (nla);size_t len;ssize_t ret;Or even
lib/nlattr.c +0
-0size_t srclen =nla_len (nla);char *src =nla_data (nla);ssize_t ret;size_t len;
Quoted 1 line
;)
Oops, sorry, yes. ENOCOFFEE on my end. :)
Signature · 1 line
Kees Cook
Re: [RFC][PATCH v2 2/3] Modify return value of nla_strlcpy to match that of strscpy.
In reply to Kees CookQuoted 42 lines · Le mardi 20 octobre 2020, 01:01:27 CEST Kees Cook a écrit :
Quoted 9 lines · Jakub Kicinski
On Mon, 19 Oct 2020 17:23:30 +0200 [email protected]
Quoted 6 lines · wrote:
(quoted diff) +1
-1-size_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize) +ssize_t nla_strlcpy(char *dst, const struct nlattr *nla, size_tdstsize)
{
Quoted 7 lines
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 728
Quoted 5 lines
lib/nlattr.c +2
-0+size_t len; +ssize_t ret;size_t srclen =nla_len (nla);char *src =nla_data (nla);Sort local variables long to short.
Specifically, "reverse christmas tree":
lib/nlattr.c +0
-0size_t srclen =nla_len (nla);char *src =nla_data (nla);size_t len;ssize_t ret;Quoted 18 lines
Quoted 6 lines
net/sched/cls_api.c +0
-0net/sched/cls_api.c static inline u32 tcf_auto_prio(struct tcf_proto · line 226
Quoted 9 lines
net/sched/cls_api.c +1
-1@@ -223,7 +223,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)static bool tcf_proto_check_kind (struct nlattr *kind,char *name) {if (kind) -return nla_strlcpy (name, kind,IFNAMSIZ ) >=IFNAMSIZ ; +return nla_strlcpy (name, kind,IFNAMSIZ ) >0 ;Bug.
Quoted 7 lines
Quoted 4 lines
net/sched/cls_api.c static inline u32 tcf_auto_prio(struct tcf_proto *tp) · line 229
Quoted 4 lines
net/sched/cls_api.c +0
-0memset (name,0 ,IFNAMSIZ );return false; }Have you been able to exercise the changed code paths? (I would have expected this to immediately fail, for example.)
Unfortunately no...
As I said in the cover letter I only tested the modifications on char* and the tcf_proto_check_kind function seems not to be called in my VM... I will try to trigger it though!
Re: [RFC][PATCH v2 2/3] Modify return value of nla_strlcpy to match that of strscpy.
In reply to Jakub KicinskiQuoted 9 lines · Le lundi 19 octobre 2020, 18:43:55 CEST Jakub Kicinski a écrit :
On Mon, 19 Oct 2020 17:23:30 +0200 [email protected]
Quoted 6 lines · wrote:
include/net/pkt_cls.h +0
-0@@ -4,6 +4,7 @@
Quoted 6 lines
include/net/pkt_cls.h line 7
Quoted 4 lines
include/net/pkt_cls.h +1
-0#include <linux/pkt_cls.h> #include <linux/workqueue.h> +#include <linux/errno.h> Stray include.
I removed it from my patch.
Did you use a tool to see this include is not used? If yes, which one?
Quoted 10 lines
Quoted 10 lines
include/net/pkt_cls.h +0
-0#include <net/sch_generic.h> #include <net/act_api.h> #include <
net/net_namespace.h>lib/nlattr.c +0
-0@@ -713,30 +713,39 @@ EXPORT_SYMBOL(nla_find);
Quoted 7 lines
lib/nlattr.c EXPORT_SYMBOL(nla_find);
Quoted 5 lines
lib/nlattr.c +1
-0* @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer +* @returns: -E2BIG if @dstsize is 0 or source buffer length greater than I don't think this is correct format for kdoc.
I corrected it.
I will take the habit to run scripts/kernel-doc on my modifications.
Quoted 22 lines
Quoted 22 lines
lib/nlattr.c +6
-5+* @dstsize, otherwise it returns the number of copied characters (not +* including the trailing %NUL). * * Copies at most dstsize - 1 bytes into the destination buffer. -* The result is always a valid NUL-terminated string. Unlike -* strlcpy the destination buffer is always padded out. -* -* Returns the length of the source buffer. +* Unlike strlcpy the destination buffer is always padded out. */ -size_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) { +size_t len; +ssize_t ret;
Quoted 8 lines
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 728
Quoted 2 lines
lib/nlattr.c +0
-0size_t srclen =nla_len (nla);char *src =nla_data (nla);Sort local variables long to short.
lib/nlattr.c EXPORT_SYMBOL(nla_find); · line 730
Quoted 1 line
lib/nlattr.c +1
-0+if (dstsize ==0 ||WARN_ON_ONCE (dstsize >INT_MAX ))You can make it >
U16_MAX, attr len is 16 bit.
Done for v3!
Quoted 53 lines
Quoted 38 lines
lib/nlattr.c +13
-7+return -E2BIG ; +if (srclen >0 && src[srclen -1 ] =='\0' ) srclen--; -if (dstsize >0 ) { -size_t len = (srclen >= dstsize) ? dstsize -1 : srclen; - -memcpy (dst, src, len); -/* Zero pad end of dst. */ -memset (dst + len,0 , dstsize - len); +if (srclen >= dstsize) { + len = dstsize -1 ; + ret = -E2BIG ; + }else { + len = srclen; + ret = len; } -return srclen; +memcpy (dst, src, len); +/* Zero pad end of dst. */ +memset (dst + len,0 , dstsize - len); + +return ret; }EXPORT_SYMBOL (nla_strlcpy);net/sched/cls_api.c +0
-0net/sched/cls_api.c static inline u32 tcf_auto_prio(struct tcf_proto *tp) · line 229
Quoted 8 lines
net/sched/cls_api.c +1
-1@@ -223,7 +223,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)static bool tcf_proto_check_kind (struct nlattr *kind,char *name) {if (kind) -return nla_strlcpy (name, kind,IFNAMSIZ ) >=IFNAMSIZ ; +return nla_strlcpy (name, kind,IFNAMSIZ ) >0 ;Bug.
Quoted 4 lines
net/sched/cls_api.c +0
-0memset (name,0 ,IFNAMSIZ );return false; }
RFC PATCH v2 3/3 Rename nla_strlcpy to nla_strcpy.
In reply to [email protected]From: Francis Laniel <[email protected]>
Calls to nla_strlcpy are now replaced by calls to nla_strcpy which is the new name of this function.
--- 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 | 8 ++++---- 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, 50 insertions(+), 50 deletions(-)
drivers/infiniband/core/nldev.c +5 -5
@@ -932,7 +932,7 @@ static int nldev_set_doit(struct sk_buff *skb, struct nlmsghdr *nlh,if (tb[RDMA_NLDEV_ATTR_DEV_NAME ]) {char name[IB_DEVICE_NAME_MAX ] = {}; -nla_strlcpy (name, tb[RDMA_NLDEV_ATTR_DEV_NAME ], +nla_strcpy (name, tb[RDMA_NLDEV_ATTR_DEV_NAME ],IB_DEVICE_NAME_MAX );if (strlen (name) ==0 ) { err = -EINVAL ;
@@ -1529,13 +1529,13 @@ static int nldev_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, !tb[RDMA_NLDEV_ATTR_LINK_TYPE] || !tb[RDMA_NLDEV_ATTR_NDEV_NAME])return -EINVAL ; -nla_strlcpy (ibdev_name, tb[RDMA_NLDEV_ATTR_DEV_NAME ], +nla_strcpy (ibdev_name, tb[RDMA_NLDEV_ATTR_DEV_NAME ],sizeof (ibdev_name));if (strchr (ibdev_name,'%' ) ||strlen (ibdev_name) ==0 )return -EINVAL ; -nla_strlcpy (type, tb[RDMA_NLDEV_ATTR_LINK_TYPE ],sizeof (type)); -nla_strlcpy (ndev_name, tb[RDMA_NLDEV_ATTR_NDEV_NAME ], +nla_strcpy (type, tb[RDMA_NLDEV_ATTR_LINK_TYPE ],sizeof (type)); +nla_strcpy (ndev_name, tb[RDMA_NLDEV_ATTR_NDEV_NAME ],sizeof (ndev_name)); ndev =dev_get_by_name (sock_net (skb->sk), ndev_name);
@@ -1602,7 +1602,7 @@ static int nldev_get_chardev(struct sk_buff *skb, struct nlmsghdr *nlh,if (err || !tb[RDMA_NLDEV_ATTR_CHARDEV_TYPE ])return -EINVAL ; -nla_strlcpy (client_name, tb[RDMA_NLDEV_ATTR_CHARDEV_TYPE ], +nla_strcpy (client_name, tb[RDMA_NLDEV_ATTR_CHARDEV_TYPE ],sizeof (client_name));if (tb[RDMA_NLDEV_ATTR_DEV_INDEX ]) {
drivers/net/can/vxcan.c +2 -2
@@ -186,7 +186,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, }if (ifmp && tbp[IFLA_IFNAME ]) { -nla_strlcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); name_assign_type =NET_NAME_USER ; }else {snprintf (ifname,IFNAMSIZ ,DRV_NAME "%%d" );
@@ -223,7 +223,7 @@ static int vxcan_newlink(struct net *net, struct net_device *dev,/* register first device */ if (tb[IFLA_IFNAME ]) -nla_strlcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ );else snprintf (dev->name,IFNAMSIZ ,DRV_NAME "%%d" );
drivers/net/veth.c +2 -2
@@ -1329,7 +1329,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, }if (ifmp && tbp[IFLA_IFNAME ]) { -nla_strlcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tbp[IFLA_IFNAME ],IFNAMSIZ ); name_assign_type =NET_NAME_USER ; }else {snprintf (ifname,IFNAMSIZ ,DRV_NAME "%%d" );
@@ -1379,7 +1379,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev,eth_hw_addr_random (dev);if (tb[IFLA_IFNAME ]) -nla_strlcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (dev->name, tb[IFLA_IFNAME ],IFNAMSIZ );else snprintf (dev->name,IFNAMSIZ ,DRV_NAME "%%d" );
include/linux/genl_magic_struct.h +1 -1
@@ -89,7 +89,7 @@ static inline int nla_put_u64_0pad(struct sk_buff *skb, int attrtype, u64 value) nla_get_u64, nla_put_u64_0pad, false)#define __str_field (attr_nr, attr_flag, name, maxlen) \ __array(attr_nr, attr_flag, name, NLA_NUL_STRING, char, maxlen, \ - nla_strlcpy, nla_put, false) + nla_strcpy, nla_put, false)#define __bin_field (attr_nr, attr_flag, name, maxlen) \ __array(attr_nr, attr_flag, name, NLA_BINARY, char, maxlen, \ nla_memcpy, nla_put, false)
include/net/netlink.h +2 -2
@@ -142,7 +142,7 @@* Attribute Misc: * nla_memcpy(dest, nla, count) copy attribute into memory * nla_memcmp(nla, data, size) compare attribute with memory area -* nla_strlcpy(dst, nla, size) copy attribute to a sized string +* nla_strcpy(dst, nla, size) copy attribute to a sized string * nla_strcmp(nla, str) compare attribute with string * * Attribute Parsing:
@@ -506,7 +506,7 @@ int __nla_parse(struct nlattr **tb, int maxtype, const struct nlattr *head, struct netlink_ext_ack *extack);int nla_policy_len (const struct nla_policy *,int );struct nlattr *nla_find (const struct nlattr *head,int len,int attrtype); -ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize); +ssize_t nla_strcpy (char *dst,const struct nlattr *nla,size_t dstsize);char *nla_strdup (const struct nlattr *nla,gfp_t flags);int nla_memcpy (void *dest,const struct nlattr *src,int count);int nla_memcmp (const struct nlattr *nla,const void *data,size_t size);
include/net/pkt_cls.h +1 -1
@@ -513,7 +513,7 @@ tcf_change_indev(struct net *net, struct nlattr *indev_tlv,char indev[IFNAMSIZ ];struct net_device *dev; -if (nla_strlcpy (indev, indev_tlv,IFNAMSIZ ) <0 ) { +if (nla_strcpy (indev, indev_tlv,IFNAMSIZ ) <0 ) {NL_SET_ERR_MSG_ATTR (extack, indev_tlv,"Interface name too long" );return -EINVAL ;
kernel/taskstats.c +1 -1
@@ -346,7 +346,7 @@ static int parse(struct nlattr *na, struct cpumask *mask) data =kmalloc (len,GFP_KERNEL );if (!data)return -ENOMEM ; -nla_strlcpy (data, na, len); +nla_strcpy (data, na, len); ret =cpulist_parse (data, mask);kfree (data);return ret;
lib/nlattr.c +4 -4
@@ -709,7 +709,7 @@ struct nlattr *nla_find(const struct nlattr *head, int len, int attrtype)EXPORT_SYMBOL (nla_find);/** -* nla_strlcpy - Copy string attribute payload into a sized buffer +* nla_strcpy - Copy string attribute payload into a sized buffer * @dst: where to copy the string to * @nla: attribute to copy the string from * @dstsize: size of destination buffer
@@ -718,9 +718,9 @@ EXPORT_SYMBOL(nla_find);* including the trailing %NUL). * * Copies at most dstsize - 1 bytes into the destination buffer. -* Unlike strlcpy the destination buffer is always padded out. +* Unlike strcpy the destination buffer is always padded out. */ -ssize_t nla_strlcpy (char *dst,const struct nlattr *nla,size_t dstsize) +ssize_t nla_strcpy (char *dst,const struct nlattr *nla,size_t dstsize) {size_t len;ssize_t ret;
@@ -747,7 +747,7 @@ ssize_t nla_strlcpy(char *dst, const struct nlattr *nla, size_t dstsize)return ret; } -EXPORT_SYMBOL (nla_strlcpy); +EXPORT_SYMBOL (nla_strcpy);/** * nla_strdup - Copy string attribute payload into a newly allocated buffer
net/core/fib_rules.c +2 -2
@@ -563,7 +563,7 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,struct net_device *dev; nlrule->iifindex =-1 ; -nla_strlcpy (nlrule->iifname, tb[FRA_IIFNAME ],IFNAMSIZ ); +nla_strcpy (nlrule->iifname, tb[FRA_IIFNAME ],IFNAMSIZ ); dev =__dev_get_by_name (net, nlrule->iifname);if (dev) nlrule->iifindex = dev->ifindex;
@@ -573,7 +573,7 @@ static int fib_nl2rule(struct sk_buff *skb, struct nlmsghdr *nlh,struct net_device *dev; nlrule->oifindex =-1 ; -nla_strlcpy (nlrule->oifname, tb[FRA_OIFNAME ],IFNAMSIZ ); +nla_strcpy (nlrule->oifname, tb[FRA_OIFNAME ],IFNAMSIZ ); dev =__dev_get_by_name (net, nlrule->oifname);if (dev) nlrule->oifindex = dev->ifindex;
net/core/rtnetlink.c +6 -6
@@ -1939,7 +1939,7 @@ static const struct rtnl_link_ops *linkinfo_to_kind_ops(const struct nlattr *nlaif (linfo[IFLA_INFO_KIND ]) {char kind[MODULE_NAME_LEN ]; -nla_strlcpy (kind, linfo[IFLA_INFO_KIND ],sizeof (kind)); +nla_strcpy (kind, linfo[IFLA_INFO_KIND ],sizeof (kind)); ops =rtnl_link_ops_get (kind); }
@@ -2953,9 +2953,9 @@ static struct net_device *rtnl_dev_get(struct net *net,if (!ifname) { ifname = buffer;if (ifname_attr) -nla_strlcpy (ifname, ifname_attr,IFNAMSIZ ); +nla_strcpy (ifname, ifname_attr,IFNAMSIZ );else if (altifname_attr) -nla_strlcpy (ifname, altifname_attr,ALTIFNAMSIZ ); +nla_strcpy (ifname, altifname_attr,ALTIFNAMSIZ );else return NULL ; }
@@ -2983,7 +2983,7 @@ static int rtnl_setlink(struct sk_buff *skb, struct nlmsghdr *nlh, goto errout;if (tb[IFLA_IFNAME ]) -nla_strlcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ );else ifname[0 ] ='\0' ;
@@ -3264,7 +3264,7 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,return err;if (tb[IFLA_IFNAME ]) -nla_strlcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ ); +nla_strcpy (ifname, tb[IFLA_IFNAME ],IFNAMSIZ );else ifname[0 ] ='\0' ;
@@ -3296,7 +3296,7 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh,memset (linkinfo,0 ,sizeof (linkinfo));if (linkinfo[IFLA_INFO_KIND ]) { -nla_strlcpy (kind, linkinfo[IFLA_INFO_KIND ],sizeof (kind)); +nla_strcpy (kind, linkinfo[IFLA_INFO_KIND ],sizeof (kind)); ops =rtnl_link_ops_get (kind); }else { kind[0 ] ='\0' ;
net/decnet/dn_dev.c +1 -1
@@ -658,7 +658,7 @@ static int dn_nl_newaddr(struct sk_buff *skb, struct nlmsghdr *nlh, ifa->ifa_dev = dn_db;if (tb[IFA_LABEL ]) -nla_strlcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ ); +nla_strcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ );else memcpy (ifa->ifa_label, dev->name,IFNAMSIZ );
net/ieee802154/nl-mac.c +1 -1
@@ -149,7 +149,7 @@ static struct net_device *ieee802154_nl_get_dev(struct genl_info *info)if (info->attrs[IEEE802154_ATTR_DEV_NAME ]) {char name[IFNAMSIZ +1 ]; -nla_strlcpy (name, info->attrs[IEEE802154_ATTR_DEV_NAME ], +nla_strcpy (name, info->attrs[IEEE802154_ATTR_DEV_NAME ],sizeof (name)); dev =dev_get_by_name (&init_net, name); }else if (info->attrs[IEEE802154_ATTR_DEV_INDEX ]) {
net/ipv4/devinet.c +1 -1
@@ -881,7 +881,7 @@ static struct in_ifaddr *rtm_to_ifaddr(struct net *net, struct nlmsghdr *nlh, ifa->ifa_broadcast =nla_get_in_addr (tb[IFA_BROADCAST ]);if (tb[IFA_LABEL ]) -nla_strlcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ ); +nla_strcpy (ifa->ifa_label, tb[IFA_LABEL ],IFNAMSIZ );else memcpy (ifa->ifa_label, dev->name,IFNAMSIZ );
net/ipv4/fib_semantics.c +1 -1
@@ -973,7 +973,7 @@ bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi)char tmp[TCP_CA_NAME_MAX ];bool ecn_ca = false; -nla_strlcpy (tmp, nla,sizeof (tmp)); +nla_strcpy (tmp, nla,sizeof (tmp)); val =tcp_ca_get_key_by_name (fi->fib_net, tmp, &ecn_ca); }else {if (nla_len (nla) !=sizeof (u32))
net/ipv4/metrics.c +1 -1
@@ -31,7 +31,7 @@ static int ip_metrics_convert(struct net *net, struct nlattr *fc_mx,if (type ==RTAX_CC_ALGO ) {char tmp[TCP_CA_NAME_MAX ]; -nla_strlcpy (tmp, nla,sizeof (tmp)); +nla_strcpy (tmp, nla,sizeof (tmp)); val =tcp_ca_get_key_by_name (net, tmp, &ecn_ca);if (val ==TCP_CA_UNSPEC ) {NL_SET_ERR_MSG (extack,"Unknown tcp congestion algorithm" );
net/netfilter/ipset/ip_set_hash_netiface.c +2 -2
@@ -225,7 +225,7 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],if (e.cidr >HOST_MASK )return -IPSET_ERR_INVALID_CIDR ; } -nla_strlcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ ); +nla_strcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ );if (tb[IPSET_ATTR_CADT_FLAGS ]) {u32 cadt_flags =ip_set_get_h32 (tb[IPSET_ATTR_CADT_FLAGS ]);
@@ -442,7 +442,7 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[],ip6_netmask (&e.ip, e.cidr); -nla_strlcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ ); +nla_strcpy (e.iface, tb[IPSET_ATTR_IFACE ],IFNAMSIZ );if (tb[IPSET_ATTR_CADT_FLAGS ]) {u32 cadt_flags =ip_set_get_h32 (tb[IPSET_ATTR_CADT_FLAGS ]);
net/netfilter/nf_tables_api.c +3 -3
@@ -1281,7 +1281,7 @@ static struct nft_chain *nft_chain_lookup(struct net *net,if (nla ==NULL )return ERR_PTR (-EINVAL ); -nla_strlcpy (search, nla,sizeof (search)); +nla_strcpy (search, nla,sizeof (search));WARN_ON (!rcu_read_lock_held () && !lockdep_commit_lock_is_held (net));
@@ -1721,7 +1721,7 @@ static struct nft_hook *nft_netdev_hook_alloc(struct net *net, goto err_hook_alloc; } -nla_strlcpy (ifname, attr,IFNAMSIZ ); +nla_strcpy (ifname, attr,IFNAMSIZ ); dev =__dev_get_by_name (net, ifname);if (!dev) { err = -ENOENT ;
@@ -5734,7 +5734,7 @@ struct nft_object *nft_obj_lookup(const struct net *net,struct rhlist_head *tmp, *list;struct nft_object *obj; -nla_strlcpy (search, nla,sizeof (search)); +nla_strcpy (search, nla,sizeof (search)); k.name = search; WARN_ON_ONCE(!rcu_read_lock_held() &&
net/netfilter/nfnetlink_acct.c +1 -1
@@ -112,7 +112,7 @@ static int nfnl_acct_new(struct net *net, struct sock *nfnl, nfacct->flags = flags; } -nla_strlcpy (nfacct->name, tb[NFACCT_NAME ],NFACCT_NAME_MAX ); +nla_strcpy (nfacct->name, tb[NFACCT_NAME ],NFACCT_NAME_MAX );if (tb[NFACCT_BYTES ]) { atomic64_set(&nfacct->bytes,
net/netfilter/nfnetlink_cthelper.c +2 -2
@@ -146,7 +146,7 @@ nfnl_cthelper_expect_policy(struct nf_conntrack_expect_policy *expect_policy, !tb[NFCTH_POLICY_EXPECT_TIMEOUT])return -EINVAL ; -nla_strlcpy (expect_policy->name, +nla_strcpy (expect_policy->name, tb[NFCTH_POLICY_NAME ],NF_CT_HELPER_NAME_LEN ); expect_policy->max_expected =ntohl (nla_get_be32 (tb[NFCTH_POLICY_EXPECT_MAX ]));
@@ -233,7 +233,7 @@ nfnl_cthelper_create(const struct nlattr * const tb[],if (ret <0 ) goto err1; -nla_strlcpy (helper->name, +nla_strcpy (helper->name, tb[NFCTH_NAME ],NF_CT_HELPER_NAME_LEN ); size =ntohl (nla_get_be32 (tb[NFCTH_PRIV_DATA_LEN ])); if (size > sizeof_field(struct nf_conn_help, data)) {
net/netfilter/nft_ct.c +1 -1
@@ -990,7 +990,7 @@ static int nft_ct_helper_obj_init(const struct nft_ctx *ctx,if (!priv->l4proto)return -ENOENT ; -nla_strlcpy (name, tb[NFTA_CT_HELPER_NAME ],sizeof (name)); +nla_strcpy (name, tb[NFTA_CT_HELPER_NAME ],sizeof (name));if (tb[NFTA_CT_HELPER_L3PROTO ]) family =ntohs (nla_get_be16 (tb[NFTA_CT_HELPER_L3PROTO ]));
net/netfilter/nft_log.c +1 -1
@@ -152,7 +152,7 @@ static int nft_log_init(const struct nft_ctx *ctx, priv->prefix =kmalloc (nla_len (nla) +1 ,GFP_KERNEL );if (priv->prefix ==NULL )return -ENOMEM ; -nla_strlcpy (priv->prefix, nla,nla_len (nla) +1 ); +nla_strcpy (priv->prefix, nla,nla_len (nla) +1 ); }else { priv->prefix = (char *)nft_log_null_prefix; }
net/netlabel/netlabel_mgmt.c +1 -1
@@ -95,7 +95,7 @@ static int netlbl_mgmt_add_common(struct genl_info *info, ret_val = -ENOMEM ; goto add_free_entry; } -nla_strlcpy (entry->domain, +nla_strcpy (entry->domain, info->attrs[NLBL_MGMT_A_DOMAIN ], tmp_size); }
net/nfc/netlink.c +1 -1
@@ -1226,7 +1226,7 @@ static int nfc_genl_fw_download(struct sk_buff *skb, struct genl_info *info)if (!dev)return -ENODEV ; -nla_strlcpy (firmware_name, info->attrs[NFC_ATTR_FIRMWARE_NAME ], +nla_strcpy (firmware_name, info->attrs[NFC_ATTR_FIRMWARE_NAME ],sizeof (firmware_name)); rc =nfc_fw_download (dev, firmware_name);
net/sched/act_api.c +1 -1
@@ -935,7 +935,7 @@ struct tc_action *tcf_action_init_1(struct net *net, struct tcf_proto *tp,NL_SET_ERR_MSG (extack,"TC action kind must be specified" ); goto err_out; } -if (nla_strlcpy (act_name, kind,IFNAMSIZ ) <0 ) { +if (nla_strcpy (act_name, kind,IFNAMSIZ ) <0 ) {NL_SET_ERR_MSG (extack,"TC action name too long" ); goto err_out; }
net/sched/act_ipt.c +1 -1
@@ -166,7 +166,7 @@ static int __tcf_ipt_init(struct net *net, unsigned int id, struct nlattr *nla,if (unlikely (!tname)) goto err1;if (tb[TCA_IPT_TABLE ] ==NULL || -nla_strlcpy (tname, tb[TCA_IPT_TABLE ],IFNAMSIZ ) >=IFNAMSIZ ) +nla_strcpy (tname, tb[TCA_IPT_TABLE ],IFNAMSIZ ) >=IFNAMSIZ )strcpy (tname,"mangle" ); t =kmemdup (td, td->u.target_size,GFP_KERNEL );
net/sched/act_simple.c +2 -2
@@ -52,7 +52,7 @@ static int alloc_defdata(struct tcf_defact *d, const struct nlattr *defdata) d->tcfd_defdata =kzalloc (SIMP_MAX_DATA ,GFP_KERNEL );if (unlikely (!d->tcfd_defdata))return -ENOMEM ; -nla_strlcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA ); +nla_strcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA );return 0 ; }
@@ -71,7 +71,7 @@ static int reset_policy(struct tc_action *a, const struct nlattr *defdata,spin_lock_bh (&d->tcf_lock); goto_ch =tcf_action_set_ctrlact (a, p->action, goto_ch);memset (d->tcfd_defdata,0 ,SIMP_MAX_DATA ); -nla_strlcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA ); +nla_strcpy (d->tcfd_defdata, defdata,SIMP_MAX_DATA );spin_unlock_bh (&d->tcf_lock);if (goto_ch)tcf_chain_put_by_act (goto_ch);
net/sched/cls_api.c +1 -1
@@ -223,7 +223,7 @@ static inline u32 tcf_auto_prio(struct tcf_proto *tp)static bool tcf_proto_check_kind (struct nlattr *kind,char *name) {if (kind) -return nla_strlcpy (name, kind,IFNAMSIZ ) >0 ; +return nla_strcpy (name, kind,IFNAMSIZ ) >0 ;memset (name,0 ,IFNAMSIZ );return false; }
net/sched/sch_api.c +1 -1
@@ -1170,7 +1170,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,#ifdef CONFIG_MODULES if (ops ==NULL && kind !=NULL ) {char name[IFNAMSIZ ]; -if (nla_strlcpy (name, kind,IFNAMSIZ ) >0 ) { +if (nla_strcpy (name, kind,IFNAMSIZ ) >0 ) {/* We dropped the RTNL semaphore in order to * perform the module load. So, even if we * succeeded in loading the module we have to
net/tipc/netlink_compat.c +1 -1
@@ -695,7 +695,7 @@ static int tipc_nl_compat_link_dump(struct tipc_nl_compat_msg *msg, link_info.dest =nla_get_flag (link[TIPC_NLA_LINK_DEST ]); link_info.up =htonl (nla_get_flag (link[TIPC_NLA_LINK_UP ])); -nla_strlcpy (link_info.str, link[TIPC_NLA_LINK_NAME ], +nla_strcpy (link_info.str, link[TIPC_NLA_LINK_NAME ],TIPC_MAX_LINK_NAME ); return tipc_add_tlv(msg->rep, TIPC_TLV_LINK_INFO,
Signature · 1 line
2.20.1
Jakub Kicinski
maintainerRe: [RFC][PATCH v2 0/3] Fix inefficiences and rename nla_strlcpy
In reply to [email protected]Quoted 11 lines · On Mon, 19 Oct 2020 17:23:28 +0200 [email protected] wrote:
To sum up, the first patch fixes an inefficiency where some bytes in dst were written twice, one with 0 the other with src content.
The second one modifiesnla_strlcpyto return the same value as strscpy, i.e. number of bytes written or-E2BIGif src was truncated.
The third renamenla_strlcpytonla_strcpy.Unfortunately, I did not find how to create struct nlattr objects so I tested my modifications on simple char*.
This is why I tag this patch set as RFC.If you see any way to improve the code or have any remark, feel free to comment.
You follow semantics of strscpy, yet rename to strcpy. Wouldn't it be more intuitive for developers to rename to nla_strscpy?
Please make sure that you CC netdev on the next iteration.
Re: [RFC][PATCH v2 0/3] Fix inefficiences and rename nla_strlcpy
Quoted 8 lines · Jakub Kicinski
Quoted 6 lines · On Mon, 19 Oct 2020 17:23:28 +0200 [email protected] wrote:
To sum up, the first patch fixes an inefficiency where some bytes in dst were written twice, one with 0 the other with src content.
The second one modifiesnla_strlcpyto return the same value as strscpy, i.e. number of bytes written or-E2BIGif src was truncated.
The third renamenla_strlcpytonla_strcpy.
Quoted 8 lines
Quoted 5 lines
Unfortunately, I did not find how to create struct nlattr objects so I tested my modifications on simple char*.
This is why I tag this patch set as RFC.If you see any way to improve the code or have any remark, feel free to comment.
You follow semantics of strscpy, yet rename to strcpy. Wouldn't it be more intuitive for developers to rename to
nla_strscpy?
It's closer to strscpy_pad() but that seems a long name. What's preferred from the NLA perspective?
Signature · 1 line
Kees Cook
Jakub Kicinski
maintainerRe: [RFC][PATCH v2 0/3] Fix inefficiences and rename nla_strlcpy
Quoted 13 lines · On Mon, 19 Oct 2020 15:58:36 -0700 Kees Cook wrote:
Quoted 12 lines · Jakub Kicinski
Quoted 10 lines · On Mon, 19 Oct 2020 17:23:28 +0200 [email protected] wrote:
To sum up, the first patch fixes an inefficiency where some bytes in dst were written twice, one with 0 the other with src content.
The second one modifiesnla_strlcpyto return the same value as strscpy, i.e. number of bytes written or-E2BIGif src was truncated.
The third renamenla_strlcpytonla_strcpy.Unfortunately, I did not find how to create struct nlattr objects so I tested my modifications on simple char*.
This is why I tag this patch set as RFC.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
If you see any way to improve the code or have any remark, feel free to comment.
You follow semantics of strscpy, yet rename to strcpy. Wouldn't it be more intuitive for developers to rename to
nla_strscpy?It's closer to
strscpy_pad()but that seems a long name. What's preferred from the NLA perspective?
I think the pad part is pretty much implied in the netlink world. All this stuff goes to user space, so we can't have uninit memory. We may get more informed opinions once this hits netdev@.
Re: [RFC][PATCH v2 0/3] Fix inefficiences and rename nla_strlcpy
Quoted 21 lines · Le mardi 20 octobre 2020, 01:34:12 CEST Jakub Kicinski a écrit :
Quoted 20 lines · On Mon, 19 Oct 2020 15:58:36 -0700 Kees Cook wrote:
Quoted 18 lines · Jakub Kicinski
On Mon, 19 Oct 2020 17:23:28 +0200 [email protected]
Quoted 7 lines · wrote:
To sum up, the first patch fixes an inefficiency where some bytes in dst were written twice, one with 0 the other with src content. The second one modifies
nla_strlcpyto return the same value as strscpy,
i.e. number of bytes written or-E2BIGif src was truncated. The third renamenla_strlcpytonla_strcpy.Quoted 6 lines
Unfortunately, I did not find how to create struct nlattr objects so I tested my modifications on simple char*.
This is why I tag this patch set as RFC.If you see any way to improve the code or have any remark, feel free to comment.> >
You follow semantics of strscpy, yet rename to strcpy. Wouldn't it be more intuitive for developers to rename to
nla_strscpy?
Quoted 6 lines
Quoted 2 lines
It's closer to
strscpy_pad()but that seems a long name. What's preferred from the NLA perspective?I think the pad part is pretty much implied in the netlink world. All this stuff goes to user space, so we can't have uninit memory. We may get more informed opinions once this hits netdev@.
I will rename it nla_strscpy for the next version and we will discuss the name with the netdev list.
Re: [RFC][PATCH v2 0/3] Fix inefficiences and rename nla_strlcpy
In reply to [email protected][process nit: please don't use "--in-reply-to=" for git send-email, as it ends up collecting all the versioned threads together, which makes them harder to review. Each version should be a separate thread.]
Signature · 1 line
Kees Cook
Re: [RFC][PATCH v2 0/3] Fix inefficiences and rename nla_strlcpy
Quoted 3 lines · Le mardi 20 octobre 2020, 01:03:18 CEST Kees Cook a écrit :
[process nit: please don't use "--in-reply-to=" for git send-email, as it ends up collecting all the versioned threads together, which makes them harder to review. Each version should be a separate thread.]
Thank you for the advice!
Will be done for next patch set!