netlink: replace obsolete NLMSG_* with type safe nlmsg_*
Subsystems (13)
PATCH 1/1 netlink: replace obsolete NLMSG_* with type safe nlmsg_*
Thomas, please review it. Next should we made nlmsg_* available for uapi?
--- drivers/connector/connector.c | 8 ++--- drivers/scsi/scsi_netlink.c | 4 +-- drivers/scsi/scsi_transport_fc.c | 10 +++--- drivers/scsi/scsi_transport_iscsi.c | 56 +++++++++++++++++----------------- drivers/staging/gdm72xx/netlink_k.c | 12 ++++---- kernel/audit.c | 10 +++--- net/bridge/netfilter/ebt_ulog.c | 4 +-- net/core/rtnetlink.c | 4 +-- net/decnet/dn_table.c | 4 +-- net/decnet/netfilter/dn_rtmsg.c | 6 ++-- net/ieee802154/netlink.c | 4 +-- net/ipv4/fib_frontend.c | 6 ++-- net/ipv4/ipmr.c | 10 +++--- net/ipv4/netfilter/ipt_ULOG.c | 4 +-- net/ipv4/udp_diag.c | 2 +- net/ipv6/ip6mr.c | 10 +++--- net/netfilter/ipset/ip_set_core.c | 5 ++- net/netfilter/nfnetlink.c | 7 ++--- net/netfilter/nfnetlink_log.c | 4 +-- net/netfilter/nfnetlink_queue_core.c | 2 +- net/netlink/af_netlink.c | 4 +-- net/sched/cls_api.c | 4 +-- net/sched/sch_api.c | 2 +- net/tipc/netlink.c | 6 ++-- security/selinux/hooks.c | 4 +-- security/selinux/netlink.c | 3 +- 26 files changed, 96 insertions(+), 99 deletions(-)
drivers/connector/connector.c +4 -4
@@ -23,7 +23,7 @@#include <linux/module.h> #include <linux/list.h> #include <linux/skbuff.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/moduleparam.h> #include <linux/connector.h> #include <linux/slab.h>
@@ -95,7 +95,7 @@ int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)if (!netlink_has_listeners (dev->nls, group))return -ESRCH ; - size =NLMSG_SPACE (sizeof (*msg) + msg->len); + size =nlmsg_total_size (sizeof (*msg) + msg->len); skb =alloc_skb (size, gfp_mask);if (!skb)
@@ -124,7 +124,7 @@ static int cn_call_callback(struct sk_buff *skb) {struct cn_callback_entry *i, *cbq =NULL ;struct cn_dev *dev = &cdev; -struct cn_msg *msg =NLMSG_DATA (nlmsg_hdr (skb)); +struct cn_msg *msg =nlmsg_data (nlmsg_hdr (skb));struct netlink_skb_parms *nsp = &NETLINK_CB (skb);int err = -ENODEV ;
@@ -162,7 +162,7 @@ static void cn_rx_skb(struct sk_buff *__skb) skb =skb_get (__skb); -if (skb->len >=NLMSG_SPACE (0 )) { +if (skb->len >=nlmsg_total_size (0 )) { nlh =nlmsg_hdr (skb); if (nlh->nlmsg_len < sizeof(struct cn_msg) ||
drivers/scsi/scsi_netlink.c +2 -2
@@ -50,7 +50,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb)u32 rlen;int err, tport; -while (skb->len >=NLMSG_SPACE (0 )) { +while (skb->len >=nlmsg_total_size (0 )) { err =0 ; nlh =nlmsg_hdr (skb);
@@ -70,7 +70,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb) goto next_msg; } - hdr =NLMSG_DATA (nlh); + hdr =nlmsg_data (nlh);if ((hdr->version !=SCSI_NL_VERSION ) || (hdr->magic !=SCSI_NL_MAGIC )) { err = -EPROTOTYPE ;
drivers/scsi/scsi_transport_fc.c +5 -5
@@ -35,7 +35,7 @@#include <scsi/scsi_transport.h> #include <scsi/scsi_transport_fc.h> #include <scsi/scsi_cmnd.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <net/netlink.h> #include <scsi/scsi_netlink_fc.h> #include <scsi/scsi_bsg_fc.h>
@@ -543,7 +543,7 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number, } len =FC_NL_MSGALIGN (sizeof (*event)); - skblen =NLMSG_SPACE (len); + skblen =nlmsg_total_size (len); skb =alloc_skb (skblen,GFP_KERNEL );if (!skb) {
@@ -557,7 +557,7 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number, err = -ENOBUFS ; goto send_fail_skb; } - event =NLMSG_DATA (nlh); + event =nlmsg_data (nlh);INIT_SCSI_NL_HDR (&event->snlh,SCSI_NL_TRANSPORT_FC ,FC_NL_ASYNC_EVENT , len);
@@ -613,7 +613,7 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, } len =FC_NL_MSGALIGN (sizeof (*event) + data_len); - skblen =NLMSG_SPACE (len); + skblen =nlmsg_total_size (len); skb =alloc_skb (skblen,GFP_KERNEL );if (!skb) {
@@ -627,7 +627,7 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, err = -ENOBUFS ; goto send_vendor_fail_skb; } - event =NLMSG_DATA (nlh); + event =nlmsg_data (nlh);INIT_SCSI_NL_HDR (&event->snlh,SCSI_NL_TRANSPORT_FC ,FC_NL_ASYNC_EVENT , len);
drivers/scsi/scsi_transport_iscsi.c +28 -28
222 lines not on this page · raw message
drivers/staging/gdm72xx/netlink_k.c +6 -6
@@ -15,7 +15,7 @@#include <linux/module.h> #include <linux/etherdevice.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <asm/byteorder.h> #include <net/sock.h>
@@ -25,12 +25,12 @@#define ND_MAX_GROUP 30#define ND_IFINDEX_LEN sizeof(int) -#define ND_NLMSG_SPACE (len) (NLMSG_SPACE(len) + ND_IFINDEX_LEN) +#define ND_NLMSG_SPACE (len) (nlmsg_total_size(len) + ND_IFINDEX_LEN)#define ND_NLMSG_DATA (nlh) \ - ((void *)((char *)NLMSG_DATA(nlh) + ND_IFINDEX_LEN)) + ((void *)((char *)nlmsg_data(nlh) + ND_IFINDEX_LEN))#define ND_NLMSG_S_LEN (len) (len+ND_IFINDEX_LEN)#define ND_NLMSG_R_LEN (nlh) (nlh->nlmsg_len-ND_IFINDEX_LEN) -#define ND_NLMSG_IFIDX (nlh) NLMSG_DATA(nlh) +#define ND_NLMSG_IFIDX (nlh) nlmsg_data(nlh)#define ND_MAX_MSG_LEN 8096#if defined(DEFINE_MUTEX )
@@ -51,7 +51,7 @@ static void netlink_rcv_cb(struct sk_buff *skb)void *msg;int ifindex; -if (skb->len >=NLMSG_SPACE (0 )) { +if (skb->len >=nlmsg_total_size (0 )) { nlh = (struct nlmsghdr *)skb->data; if (skb->len < nlh->nlmsg_len ||
@@ -124,7 +124,7 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)return -EINVAL ; } - skb =alloc_skb (NLMSG_SPACE (len),GFP_ATOMIC ); + skb =alloc_skb (nlmsg_total_size (len),GFP_ATOMIC );if (!skb) {pr_err ("netlink_broadcast ret=%d\n" , ret);return -ENOMEM ;
kernel/audit.c +5 -5
@@ -58,7 +58,7 @@#ifdef CONFIG_SECURITY #include <linux/security.h> #endif -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/freezer.h> #include <linux/tty.h> #include <linux/pid_namespace.h>
@@ -910,7 +910,7 @@ static void audit_receive_skb(struct sk_buff *skb) {struct nlmsghdr *nlh;/* -* len MUST be signed for NLMSG_NEXT to be able to dec it below 0 +* len MUST be signed for nlmsg_next to be able to dec it below 0 * if the nlmsg_len was not aligned */ int len;
@@ -919,13 +919,13 @@ static void audit_receive_skb(struct sk_buff *skb) nlh =nlmsg_hdr (skb); len = skb->len; -while (NLMSG_OK (nlh, len)) { +while (nlmsg_ok (nlh, len)) { err =audit_receive_msg (skb, nlh);/* if err or if this message says it wants a response */ if (err || (nlh->nlmsg_flags &NLM_F_ACK ))netlink_ack (skb, nlh, err); - nlh =NLMSG_NEXT (nlh, len); + nlh =nlmsg_next (nlh, len); } }
@@ -1483,7 +1483,7 @@ void audit_log_end(struct audit_buffer *ab)audit_log_lost ("rate limit exceeded" ); }else {struct nlmsghdr *nlh =nlmsg_hdr (ab->skb); - nlh->nlmsg_len = ab->skb->len -NLMSG_SPACE (0 ); + nlh->nlmsg_len = ab->skb->len -nlmsg_total_size (0 );if (audit_pid) {skb_queue_tail (&audit_skb_queue, ab->skb);
net/bridge/netfilter/ebt_ulog.c +2 -2
@@ -35,7 +35,7 @@#include <linux/skbuff.h> #include <linux/kernel.h> #include <linux/timer.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/netdevice.h> #include <linux/netfilter/x_tables.h> #include <linux/netfilter_bridge/ebtables.h>
@@ -134,7 +134,7 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,else copy_len = uloginfo->cprange; - size =NLMSG_SPACE (sizeof (*pm) + copy_len); + size =nlmsg_total_size (sizeof (*pm) + copy_len);if (size > nlbufsiz) {pr_debug ("Size %Zd needed, but nlbufsiz=%d\n" , size, nlbufsiz);return ;
net/core/rtnetlink.c +2 -2
@@ -2613,10 +2613,10 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) type -=RTM_BASE ;/* All the messages must have at least 1 byte length */ -if (nlh->nlmsg_len <NLMSG_LENGTH (sizeof (struct rtgenmsg ))) +if (nlh->nlmsg_len <nlmsg_msg_size (sizeof (struct rtgenmsg )))return 0 ; - family = ((struct rtgenmsg *)NLMSG_DATA (nlh))->rtgen_family; + family = ((struct rtgenmsg *)nlmsg_data (nlh))->rtgen_family; sz_idx = type>>2 ; kind = type&3 ;
net/decnet/dn_table.c +2 -2
@@ -19,7 +19,7 @@#include <linux/sockios.h> #include <linux/init.h> #include <linux/skbuff.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/rtnetlink.h> #include <linux/proc_fs.h> #include <linux/netdevice.h>
@@ -492,7 +492,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)if (!net_eq (net, &init_net))return 0 ; -if (NLMSG_PAYLOAD (cb->nlh,0 ) >=sizeof (struct rtmsg ) && +if (nlmsg_attrlen (cb->nlh,0 ) >=sizeof (struct rtmsg ) && ((struct rtmsg *)nlmsg_data (cb->nlh))->rtm_flags&RTM_F_CLONED )return dn_cache_dump (skb, cb);
net/decnet/netfilter/dn_rtmsg.c +3 -3
@@ -19,7 +19,7 @@#include <linux/netdevice.h> #include <linux/netfilter.h> #include <linux/spinlock.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/netfilter_decnet.h> #include <net/sock.h>
@@ -39,7 +39,7 @@ static struct sk_buff *dnrmg_build_message(struct sk_buff *rt_skb, int *errp)unsigned char *ptr;struct nf_dn_rtmsg *rtm; - size =NLMSG_SPACE (rt_skb->len); + size =nlmsg_total_size (rt_skb->len); size +=NLMSG_ALIGN (sizeof (struct nf_dn_rtmsg )); skb =alloc_skb (size,GFP_ATOMIC );if (!skb) {
@@ -53,7 +53,7 @@ static struct sk_buff *dnrmg_build_message(struct sk_buff *rt_skb, int *errp) *errp = -ENOMEM ;return NULL ; } - rtm = (struct nf_dn_rtmsg *)NLMSG_DATA (nlh); + rtm = (struct nf_dn_rtmsg *)nlmsg_data (nlh); rtm->nfdn_ifindex = rt_skb->dev->ifindex; ptr =NFDN_RTMSG (rtm);skb_copy_from_linear_data (rt_skb, ptr, rt_skb->len);
net/ieee802154/netlink.c +2 -2
@@ -65,7 +65,7 @@ struct sk_buff *ieee802154_nl_create(int flags, u8 req)int ieee802154_nl_mcast (struct sk_buff *msg,unsigned int group) {/* XXX: nlh is right at the start of msg */ -void *hdr =genlmsg_data (NLMSG_DATA (msg->data)); +void *hdr =genlmsg_data (nlmsg_data (msg->data));if (genlmsg_end (msg, hdr) <0 ) goto out;
@@ -98,7 +98,7 @@ struct sk_buff *ieee802154_nl_new_reply(struct genl_info *info,int ieee802154_nl_reply (struct sk_buff *msg,struct genl_info *info) {/* XXX: nlh is right at the start of msg */ -void *hdr =genlmsg_data (NLMSG_DATA (msg->data)); +void *hdr =genlmsg_data (nlmsg_data (msg->data));if (genlmsg_end (msg, hdr) <0 ) goto out;
net/ipv4/fib_frontend.c +3 -3
@@ -957,8 +957,8 @@ static void nl_fib_input(struct sk_buff *skb) net =sock_net (skb->sk); nlh =nlmsg_hdr (skb); -if (skb->len <NLMSG_SPACE (0 ) || skb->len < nlh->nlmsg_len || - nlh->nlmsg_len <NLMSG_LENGTH (sizeof (*frn))) +if (skb->len <nlmsg_total_size (0 ) || skb->len < nlh->nlmsg_len || + nlh->nlmsg_len <nlmsg_msg_size (sizeof (*frn)))return ; skb =skb_clone (skb,GFP_KERNEL );
@@ -966,7 +966,7 @@ static void nl_fib_input(struct sk_buff *skb)return ; nlh =nlmsg_hdr (skb); - frn = (struct fib_result_nl *)NLMSG_DATA (nlh); + frn = (struct fib_result_nl *)nlmsg_data (nlh); tb =fib_get_table (net, frn->tb_id_in);nl_fib_lookup (frn, tb);
net/ipv4/ipmr.c +5 -5
@@ -626,9 +626,9 @@ static void ipmr_destroy_unres(struct mr_table *mrt, struct mfc_cache *c)if (ip_hdr (skb)->version ==0 ) {struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull (skb,sizeof (struct iphdr )); nlh->nlmsg_type =NLMSG_ERROR ; - nlh->nlmsg_len =NLMSG_LENGTH (sizeof (struct nlmsgerr )); + nlh->nlmsg_len =nlmsg_msg_size (sizeof (struct nlmsgerr ));skb_trim (skb, nlh->nlmsg_len); - e =NLMSG_DATA (nlh); + e =nlmsg_data (nlh); e->error = -ETIMEDOUT ;memset (&e->msg,0 ,sizeof (e->msg));
@@ -910,14 +910,14 @@ static void ipmr_cache_resolve(struct net *net, struct mr_table *mrt,if (ip_hdr (skb)->version ==0 ) {struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull (skb,sizeof (struct iphdr )); -if (__ipmr_fill_mroute (mrt, skb, c,NLMSG_DATA (nlh)) >0 ) { +if (__ipmr_fill_mroute (mrt, skb, c,nlmsg_data (nlh)) >0 ) { nlh->nlmsg_len =skb_tail_pointer (skb) - (u8 *)nlh; }else { nlh->nlmsg_type =NLMSG_ERROR ; - nlh->nlmsg_len =NLMSG_LENGTH (sizeof (struct nlmsgerr )); + nlh->nlmsg_len =nlmsg_msg_size (sizeof (struct nlmsgerr ));skb_trim (skb, nlh->nlmsg_len); - e =NLMSG_DATA (nlh); + e =nlmsg_data (nlh); e->error = -EMSGSIZE ;memset (&e->msg,0 ,sizeof (e->msg)); }
net/ipv4/netfilter/ipt_ULOG.c +2 -2
@@ -37,7 +37,7 @@#include <linux/skbuff.h> #include <linux/kernel.h> #include <linux/timer.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/netdevice.h> #include <linux/mm.h> #include <linux/moduleparam.h>
@@ -172,7 +172,7 @@ static void ipt_ulog_packet(unsigned int hooknum,else copy_len = loginfo->copy_range; - size =NLMSG_SPACE (sizeof (*pm) + copy_len); + size =nlmsg_total_size (sizeof (*pm) + copy_len); ub = &ulog_buffers[groupnum];
net/ipv4/udp_diag.c +1 -1
@@ -64,7 +64,7 @@ static int udp_dump_one(struct udp_table *tbl, struct sk_buff *in_skb, goto out; err = -ENOMEM ; - rep =alloc_skb (NLMSG_SPACE ((sizeof (struct inet_diag_msg ) + + rep =alloc_skb (nlmsg_total_size ((sizeof (struct inet_diag_msg ) +sizeof (struct inet_diag_meminfo ) +64 )),GFP_KERNEL );if (!rep)
net/ipv6/ip6mr.c +5 -5
@@ -842,9 +842,9 @@ static void ip6mr_destroy_unres(struct mr6_table *mrt, struct mfc6_cache *c)if (ipv6_hdr (skb)->version ==0 ) {struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull (skb,sizeof (struct ipv6hdr )); nlh->nlmsg_type =NLMSG_ERROR ; - nlh->nlmsg_len =NLMSG_LENGTH (sizeof (struct nlmsgerr )); + nlh->nlmsg_len =nlmsg_msg_size (sizeof (struct nlmsgerr ));skb_trim (skb, nlh->nlmsg_len); - ((struct nlmsgerr *)NLMSG_DATA (nlh))->error = -ETIMEDOUT ; + ((struct nlmsgerr *)nlmsg_data (nlh))->error = -ETIMEDOUT ;rtnl_unicast (skb, net,NETLINK_CB (skb).portid); }else kfree_skb (skb);
@@ -1100,13 +1100,13 @@ static void ip6mr_cache_resolve(struct net *net, struct mr6_table *mrt,if (ipv6_hdr (skb)->version ==0 ) {struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull (skb,sizeof (struct ipv6hdr )); -if (__ip6mr_fill_mroute (mrt, skb, c,NLMSG_DATA (nlh)) >0 ) { +if (__ip6mr_fill_mroute (mrt, skb, c,nlmsg_data (nlh)) >0 ) { nlh->nlmsg_len =skb_tail_pointer (skb) - (u8 *)nlh; }else { nlh->nlmsg_type =NLMSG_ERROR ; - nlh->nlmsg_len =NLMSG_LENGTH (sizeof (struct nlmsgerr )); + nlh->nlmsg_len =nlmsg_msg_size (sizeof (struct nlmsgerr ));skb_trim (skb, nlh->nlmsg_len); - ((struct nlmsgerr *)NLMSG_DATA (nlh))->error = -EMSGSIZE ; + ((struct nlmsgerr *)nlmsg_data (nlh))->error = -EMSGSIZE ; }rtnl_unicast (skb, net,NETLINK_CB (skb).portid); }else
net/netfilter/ipset/ip_set_core.c +2 -3
@@ -15,7 +15,6 @@#include <linux/ip.h> #include <linux/skbuff.h> #include <linux/spinlock.h> -#include <linux/netlink.h> #include <linux/rculist.h> #include <net/netlink.h>
@@ -1085,7 +1084,7 @@ static int dump_init(struct netlink_callback *cb) {struct nlmsghdr *nlh =nlmsg_hdr (cb->skb); -int min_len =NLMSG_SPACE (sizeof (struct nfgenmsg )); +int min_len =nlmsg_total_size (sizeof (struct nfgenmsg ));struct nlattr *cda[IPSET_ATTR_CMD_MAX +1 ];struct nlattr *attr = (void *)nlh + min_len;u32 dump_type;
@@ -1301,7 +1300,7 @@ call_ad(struct sock *ctnl, struct sk_buff *skb, struct ip_set *set,struct sk_buff *skb2;struct nlmsgerr *errmsg;size_t payload =sizeof (*errmsg) +nlmsg_len (nlh); -int min_len =NLMSG_SPACE (sizeof (struct nfgenmsg )); +int min_len =nlmsg_total_size (sizeof (struct nfgenmsg ));struct nlattr *cda[IPSET_ATTR_CMD_MAX +1 ];struct nlattr *cmdattr;u32 *errline;
net/netfilter/nfnetlink.c +3 -4
@@ -24,10 +24,9 @@#include <linux/skbuff.h> #include <asm/uaccess.h> #include <net/sock.h> -#include <net/netlink.h> #include <linux/init.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/netfilter/nfnetlink.h> MODULE_LICENSE ("GPL" );
@@ -144,7 +143,7 @@ static int nfnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)return -EPERM ;/* All the messages must at least contain nfgenmsg */ -if (nlh->nlmsg_len <NLMSG_LENGTH (sizeof (struct nfgenmsg ))) +if (nlh->nlmsg_len <nlmsg_msg_size (sizeof (struct nfgenmsg )))return 0 ; type = nlh->nlmsg_type;
@@ -172,7 +171,7 @@ replay: } { -int min_len =NLMSG_SPACE (sizeof (struct nfgenmsg )); +int min_len =nlmsg_total_size (sizeof (struct nfgenmsg ));u_int8_t cb_id =NFNL_MSG_TYPE (nlh->nlmsg_type);struct nlattr *cda[ss->cb[cb_id].attr_count +1 ];struct nlattr *attr = (void *)nlh + min_len;
net/netfilter/nfnetlink_log.c +2 -2
@@ -19,7 +19,7 @@#include <linux/ipv6.h> #include <linux/netdevice.h> #include <linux/netfilter.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/netfilter/nfnetlink.h> #include <linux/netfilter/nfnetlink_log.h> #include <linux/spinlock.h>
@@ -609,7 +609,7 @@ nfulnl_log_packet(u_int8_t pf,/* FIXME: do we want to make the size calculation conditional based on * what is actually present? way more branches and checks, but more * memory efficient... */ - size =NLMSG_SPACE (sizeof (struct nfgenmsg )) + size =nlmsg_total_size (sizeof (struct nfgenmsg )) +nla_total_size (sizeof (struct nfulnl_msg_packet_hdr )) +nla_total_size (sizeof (u_int32_t))/* ifindex */ +nla_total_size (sizeof (u_int32_t))/* ifindex */
net/netfilter/nfnetlink_queue_core.c +1 -1
@@ -236,7 +236,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,struct nf_conn *ct =NULL ;enum ip_conntrack_info uninitialized_var (ctinfo ); - size =NLMSG_SPACE (sizeof (struct nfgenmsg )) + size =nlmsg_total_size (sizeof (struct nfgenmsg )) +nla_total_size (sizeof (struct nfqnl_msg_packet_hdr )) +nla_total_size (sizeof (u_int32_t))/* ifindex */ +nla_total_size (sizeof (u_int32_t))/* ifindex */
net/netlink/af_netlink.c +2 -2
@@ -1646,7 +1646,7 @@ struct nlmsghdr * __nlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, int type, int len, int flags) { struct nlmsghdr *nlh; -int size =NLMSG_LENGTH (len); +int size =nlmsg_msg_size (len); nlh = (struct nlmsghdr *)skb_put (skb,NLMSG_ALIGN (size)); nlh->nlmsg_type = type;
@@ -1655,7 +1655,7 @@ __nlmsg_put(struct sk_buff *skb, u32 portid, u32 seq, int type, int len, int fla nlh->nlmsg_pid = portid; nlh->nlmsg_seq = seq;if (!__builtin_constant_p (size) ||NLMSG_ALIGN (size) - size !=0 ) -memset (NLMSG_DATA (nlh) + len,0 ,NLMSG_ALIGN (size) - size); +memset (nlmsg_data (nlh) + len,0 ,NLMSG_ALIGN (size) - size);return nlh; }EXPORT_SYMBOL (__nlmsg_put);
net/sched/cls_api.c +2 -2
@@ -22,7 +22,7 @@#include <linux/skbuff.h> #include <linux/init.h> #include <linux/kmod.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/err.h> #include <linux/slab.h> #include <net/net_namespace.h>
@@ -428,7 +428,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb)const struct Qdisc_class_ops *cops;struct tcf_dump_args arg; -if (cb->nlh->nlmsg_len <NLMSG_LENGTH (sizeof (*tcm))) +if (cb->nlh->nlmsg_len <nlmsg_msg_size (sizeof (*tcm)))return skb->len; dev =__dev_get_by_index (net, tcm->tcm_ifindex);if (!dev)
net/sched/sch_api.c +1 -1
@@ -1642,7 +1642,7 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb)struct net_device *dev;int t, s_t; -if (cb->nlh->nlmsg_len <NLMSG_LENGTH (sizeof (*tcm))) +if (cb->nlh->nlmsg_len <nlmsg_msg_size (sizeof (*tcm)))return 0 ; dev =dev_get_by_index (net, tcm->tcm_ifindex);if (!dev)
net/tipc/netlink.c +3 -3
@@ -44,7 +44,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)struct nlmsghdr *rep_nlh;struct nlmsghdr *req_nlh = info->nlhdr;struct tipc_genlmsghdr *req_userhdr = info->userhdr; -int hdr_space =NLMSG_SPACE (GENL_HDRLEN +TIPC_GENL_HDRLEN ); +int hdr_space =nlmsg_total_size (GENL_HDRLEN +TIPC_GENL_HDRLEN );u16 cmd;if ((req_userhdr->cmd &0xC000 ) && (!capable (CAP_NET_ADMIN )))
@@ -53,8 +53,8 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info) cmd = req_userhdr->cmd; rep_buf =tipc_cfg_do_cmd (req_userhdr->dest, cmd, -NLMSG_DATA (req_nlh) +GENL_HDRLEN +TIPC_GENL_HDRLEN , -NLMSG_PAYLOAD (req_nlh,GENL_HDRLEN +TIPC_GENL_HDRLEN ), +nlmsg_data (req_nlh) +GENL_HDRLEN +TIPC_GENL_HDRLEN , +nlmsg_attrlen (req_nlh,GENL_HDRLEN +TIPC_GENL_HDRLEN ), hdr_space);if (rep_buf) {
security/selinux/hooks.c +2 -2
@@ -60,7 +60,7 @@#include <linux/bitops.h> #include <linux/interrupt.h> #include <linux/netdevice.h> /* for network interface checks */ -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/tcp.h> #include <linux/udp.h> #include <linux/dccp.h>
@@ -4475,7 +4475,7 @@ static int selinux_nlmsg_perm(struct sock *sk, struct sk_buff *skb)struct nlmsghdr *nlh;struct sk_security_struct *sksec = sk->sk_security; -if (skb->len <NLMSG_SPACE (0 )) { +if (skb->len <nlmsg_total_size (0 )) { err = -EINVAL ; goto out; }
security/selinux/netlink.c +1 -2
@@ -16,7 +16,6 @@#include <linux/kernel.h> #include <linux/export.h> #include <linux/skbuff.h> -#include <linux/netlink.h> #include <linux/selinux_netlink.h> #include <net/net_namespace.h> #include <net/netlink.h>
@@ -77,7 +76,7 @@ static void selnl_notify(int msgtype, void *data) len =selnl_msglen (msgtype); - skb =alloc_skb (NLMSG_SPACE (len),GFP_USER ); + skb =alloc_skb (nlmsg_total_size (len),GFP_USER );if (!skb) goto oom;
Signature · 1 line
1.7.10.4
Quoted 2 lines · Hong Zhiguo
Thomas, please review it. Next should we made nlmsg_* available for uapi?
Comments like this should go below the '---' line so they don't become part of the commit message.
See comments below, I have only listed each point once even though most of them apply to multiple chunks. So please go over your patch and look for other occurances for each comment made.
Also, you might have to split up your patch into different non networking subsystems to get it routed via the respective trees.
Quoted 4 lines
Signed-off-by Hong Zhiguo <[email protected]>--- drivers/connector/connector.c | 8 ++--- drivers/scsi/scsi_netlink.c | 4 +--
[...]
drivers/connector/connector.c static void cn_rx_skb(struct sk_buff *__skb) · line 165
Quoted 6 lines
drivers/connector/connector.c +1
-1@@ -162,7 +162,7 @@ static void cn_rx_skb(struct sk_buff *__skb) skb =skb_get (__skb); -if (skb->len >=NLMSG_SPACE (0 )) { +if (skb->len >=nlmsg_total_size (0 )) {
Can we just replace nlmsg_total_size(0) with NLMSG_HDRLEN. Seems a lot clearer to me.
drivers/scsi/scsi_transport_fc.c line 39
Quoted 11 lines
drivers/scsi/scsi_transport_fc.c +1
-1@@ -35,7 +35,7 @@#include <scsi/scsi_transport.h> #include <scsi/scsi_transport_fc.h> #include <scsi/scsi_cmnd.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <net/netlink.h>
You are including <net/netlink.h> twice now.
drivers/scsi/scsi_transport_fc.c int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len) · line 127
Quoted 6 lines
drivers/scsi/scsi_transport_fc.c +1
-1@@ -124,7 +124,7 @@ int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)return -EINVAL ; } - skb =alloc_skb (NLMSG_SPACE (len),GFP_ATOMIC ); + skb =alloc_skb (nlmsg_total_size (len),GFP_ATOMIC );
We can convert these to nlmsg_new(len, GFP_ATOMIC);
net/core/rtnetlink.c static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) · line 2616
Quoted 10 lines
net/core/rtnetlink.c +1
-1@@ -2613,10 +2613,10 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) type -=RTM_BASE ;/* All the messages must have at least 1 byte length */ -if (nlh->nlmsg_len <NLMSG_LENGTH (sizeof (struct rtgenmsg ))) +if (nlh->nlmsg_len <nlmsg_msg_size (sizeof (struct rtgenmsg )))
This can be written more clearly as:
if (nlmsg_len(nlh) < sizeof(struct rtgenmsg))
Quoted 14 lines
net/decnet/dn_table.c +1
-1@@ -19,7 +19,7 @@#include <linux/sockios.h> #include <linux/init.h> #include <linux/skbuff.h> -#include <linux/netlink.h> +#include <net/netlink.h> #include <linux/rtnetlink.h> #include <linux/proc_fs.h> #include <linux/netdevice.h>
net/decnet/dn_table.c int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb) · line 495
Quoted 5 lines
net/decnet/dn_table.c +1
-1@@ -492,7 +492,7 @@ int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb)if (!net_eq (net, &init_net))return 0 ; - if (NLMSG_PAYLOAD(cb->nlh, 0) >= sizeof(struct rtmsg) && + if (nlmsg_attrlen(cb->nlh, 0) >= sizeof(struct rtmsg) &&
nlmsg_attrlen(cb->nlh, 0) is identical to nlmsg_len(cb->nlh) which is easier to read.