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: Gu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 6a3ad801158531435848a40936a9bd74a7a522e6..bc21f520d489d0d3d445269ff282faf1b80c1905 100644 (file)
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -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)

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 048d6d6eed6d1284a735960c9b05cf61ff1c6bf3..6e49a14365dc1bea4bc442097dcaebb7bb0c08a9 100644 (file)
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -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

diff --git a/net/core/scm.c b/net/core/scm.c
index b442e7e25e601b19a8237d1a90efbaa1d572fc19..3b6899b7d810d569057b051162b51fde7c51cba8 100644 (file)
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -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) */

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 19f0387390879cca24873e736f6879245e56e575..e171b780b499dabc7d7312bb3aadbbe4b005f2bd 100644 (file)
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -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;
 

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 640f26c6a9fe7dc21a4defae797d77d711880494..8a89c738b7a3b43407293f521bd6d7e009ee7c80 100644 (file)
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -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)

diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
index 2464a00e36ab23a5cc1abaf570098b31d290173c..100c589a2a6cf951bdb8a7a2e56b087fb4fe56bf 100644 (file)
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -657,7 +657,7 @@ int ip6_datagram_send_ctl(struct net *net, struct sock *sk,
        int len;
        int err = 0;
 
-       for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+       for_each_cmsghdr(cmsg, msg) {
                int addr_type;
 
                if (!CMSG_OK(msg, cmsg)) {

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 1cd3f810723985efcbd13431e078b9885de2e2f7..2e9953b2db8402dd71c88691f263db00f2cba3e2 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1070,9 +1070,7 @@ static int iucv_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
        txmsg.class = 0;
 
        /* iterate over control messages */
-       for (cmsg = CMSG_FIRSTHDR(msg); cmsg;
-               cmsg = CMSG_NXTHDR(msg, cmsg)) {
-
+       for_each_cmsghdr(cmsg, msg) {
                if (!CMSG_OK(msg, cmsg)) {
                        err = -EINVAL;
                        goto out;

diff --git a/net/rds/send.c b/net/rds/send.c
index 40a5629a0a13c6a1eebe7afa11afafd29097afc2..42f65d4305c88dc5db279fec71d5fb844e708cc1 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -826,7 +826,7 @@ static int rds_rm_size(struct msghdr *msg, int data_len)
        int cmsg_groups = 0;
        int retval;
 
-       for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+       for_each_cmsghdr(cmsg, msg) {
                if (!CMSG_OK(msg, cmsg))
                        return -EINVAL;
 
@@ -878,7 +878,7 @@ static int rds_cmsg_send(struct rds_sock *rs, struct rds_message *rm,
        struct cmsghdr *cmsg;
        int ret = 0;
 
-       for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+       for_each_cmsghdr(cmsg, msg) {
                if (!CMSG_OK(msg, cmsg))
                        return -EINVAL;
 

diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
index 86e0f10aa2c0b35ef4d3290f7afbbd53f31215a3..e1a9373e59799fd2a9cd998fbdc4399d2d021f6a 100644 (file)
--- a/net/rxrpc/ar-output.c
+++ b/net/rxrpc/ar-output.c
@@ -45,7 +45,7 @@ static int rxrpc_sendmsg_cmsg(struct rxrpc_sock *rx, struct msghdr *msg,
        if (msg->msg_controllen == 0)
                return -EINVAL;
 
-       for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
+       for_each_cmsghdr(cmsg, msg) {
                if (!CMSG_OK(msg, cmsg))
                        return -EINVAL;
 

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index c92f96cda6994418a8543b7951ad73ed48e0000e..2625eccb77d5d7738f9e50930ab37a6db6a80760 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -6592,8 +6592,7 @@ static int sctp_msghdr_parse(const struct msghdr *msg, sctp_cmsgs_t *cmsgs)
        struct cmsghdr *cmsg;
        struct msghdr *my_msg = (struct msghdr *)msg;
 
-       for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL;
-            cmsg = CMSG_NXTHDR(my_msg, cmsg)) {
+       for_each_cmsghdr(cmsg, my_msg) {
                if (!CMSG_OK(my_msg, cmsg))
                        return -EINVAL;