Merge tag 'upstream-4.2-rc1' of git://git.infradead.org/linux-ubifs

[firefly-linux-kernel-4.4.55.git] / net / netlink / af_netlink.c

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 69d67c300b80de2963e1ec23621b13ac4f66377f..dea925388a5b7a86ba649f888fb10bb805f54edb 100644 (file)
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2290,6 +2290,28 @@ static int netlink_getsockopt(struct socket *sock, int level, int optname,
                        return -EFAULT;
                err = 0;
                break;
+       case NETLINK_LIST_MEMBERSHIPS: {
+               int pos, idx, shift;
+
+               err = 0;
+               netlink_table_grab();
+               for (pos = 0; pos * 8 < nlk->ngroups; pos += sizeof(u32)) {
+                       if (len - pos < sizeof(u32))
+                               break;
+
+                       idx = pos / sizeof(unsigned long);
+                       shift = (pos % sizeof(unsigned long)) * 8;
+                       if (put_user((u32)(nlk->groups[idx] >> shift),
+                                    (u32 __user *)(optval + pos))) {
+                               err = -EFAULT;
+                               break;
+                       }
+               }
+               if (put_user(ALIGN(nlk->ngroups / 8, sizeof(u32)), optlen))
+                       err = -EFAULT;
+               netlink_table_ungrab();
+               break;
+       }
        default:
                err = -ENOPROTOOPT;
        }