Commit b529ccf2 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[NETLINK]: Introduce nlmsg_hdr() helper 



For the common "(struct nlmsghdr *)skb->data" sequence, so that we reduce the
number of direct accesses to skb->data and for consistency with all the other
cast skb member helpers.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 965ffea4

drivers/connector/connector.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static void cn_rx_skb(struct sk_buff *__skb) 
	skb = skb_get(__skb);



	if (skb->len >= NLMSG_SPACE(0)) {

		nlh = (struct nlmsghdr *)skb->data;

		nlh = nlmsg_hdr(skb);



		if (nlh->nlmsg_len < sizeof(struct cn_msg) ||

		    skb->len < nlh->nlmsg_len ||

drivers/scsi/scsi_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb) 
	while (skb->len >= NLMSG_SPACE(0)) {

		err = 0;



		nlh = (struct nlmsghdr *) skb->data;

		nlh = nlmsg_hdr(skb);

		if ((nlh->nlmsg_len < (sizeof(*nlh) + sizeof(*hdr))) ||

		    (skb->len < nlh->nlmsg_len)) {

			printk(KERN_WARNING "%s: discarding partial skb\n",

drivers/scsi/scsi_transport_iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1081,7 +1081,7 @@ iscsi_if_rx(struct sock *sk, int len) 
			struct nlmsghdr	*nlh;

			struct iscsi_uevent *ev;



			nlh = (struct nlmsghdr *)skb->data;

			nlh = nlmsg_hdr(skb);

			if (nlh->nlmsg_len < sizeof(*nlh) ||

			    skb->len < nlh->nlmsg_len) {

				break;

fs/ecryptfs/netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ out: 
 */

static int ecryptfs_process_nl_response(struct sk_buff *skb)

{

	struct nlmsghdr *nlh = (struct nlmsghdr*)skb->data;

	struct nlmsghdr *nlh = nlmsg_hdr(skb);

	struct ecryptfs_message *msg = NLMSG_DATA(nlh);

	int rc;
@@ -181,7 +181,7 @@ receive: 
				"rc = [%d]\n", rc);

		return;

	}

	nlh = (struct nlmsghdr *)skb->data;

	nlh = nlmsg_hdr(skb);

	if (!NLMSG_OK(nlh, skb->len)) {

		ecryptfs_printk(KERN_ERR, "Received corrupt netlink "

				"message\n");

include/linux/netlink.h

+5 −0
Original line number Diff line number Diff line
@@ -138,6 +138,11 @@ struct nlattr 
#include <linux/capability.h>

#include <linux/skbuff.h>



static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb)

{

	return (struct nlmsghdr *)skb->data;

}



struct netlink_skb_parms

{

	struct ucred		creds;		/* Skb credentials	*/

CRA Git | Maintained and supported by SUSTech CRA and CCSE