Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f95b414e authored by Gu Zheng's avatar Gu Zheng Committed by David S. Miller
Browse files

net: introduce helper macro for_each_cmsghdr 



Introduce helper macro for_each_cmsghdr as a wrapper of the enumerating
cmsghdr from msghdr, just cleanup.

Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd0bcc0b

crypto/af_alg.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ int af_alg_cmsg_send(struct msghdr *msg, struct af_alg_control *con) 
{

	struct cmsghdr *cmsg;



	for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {

	for_each_cmsghdr(cmsg, msg) {

		if (!CMSG_OK(msg, cmsg))

			return -EINVAL;

		if (cmsg->cmsg_level != SOL_ALG)

include/linux/socket.h

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ struct cmsghdr { 
			     (cmsg)->cmsg_len <= (unsigned long) \

			     ((mhdr)->msg_controllen - \

			      ((char *)(cmsg) - (char *)(mhdr)->msg_control)))

#define for_each_cmsghdr(cmsg, msg) \

	for (cmsg = CMSG_FIRSTHDR(msg); \

	     cmsg; \

	     cmsg = CMSG_NXTHDR(msg, cmsg))



/*

 *	Get the next cmsg header

net/core/scm.c

+1 −2
Original line number Diff line number Diff line
@@ -129,8 +129,7 @@ int __scm_send(struct socket *sock, struct msghdr *msg, struct scm_cookie *p) 
	struct cmsghdr *cmsg;

	int err;



	for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg))

	{

	for_each_cmsghdr(cmsg, msg) {

		err = -EINVAL;



		/* Verify that cmsg_len is at least sizeof(struct cmsghdr) */

net/dccp/proto.c

+2 −3
Original line number Diff line number Diff line
@@ -703,7 +703,7 @@ EXPORT_SYMBOL_GPL(compat_dccp_getsockopt); 


static int dccp_msghdr_parse(struct msghdr *msg, struct sk_buff *skb)

{

	struct cmsghdr *cmsg = CMSG_FIRSTHDR(msg);

	struct cmsghdr *cmsg;



	/*

	 * Assign an (opaque) qpolicy priority value to skb->priority.
@@ -717,8 +717,7 @@ static int dccp_msghdr_parse(struct msghdr *msg, struct sk_buff *skb) 
	 */

	skb->priority = 0;



	for (; cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {



	for_each_cmsghdr(cmsg, msg) {

		if (!CMSG_OK(msg, cmsg))

			return -EINVAL;

net/ipv4/ip_sockglue.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int ip_cmsg_send(struct net *net, struct msghdr *msg, struct ipcm_cookie *ipc, 
	int err, val;

	struct cmsghdr *cmsg;



	for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {

	for_each_cmsghdr(cmsg, msg) {

		if (!CMSG_OK(msg, cmsg))

			return -EINVAL;

#if IS_ENABLED(CONFIG_IPV6)