ksmbd: set both ipv4 and ipv6 in FSCTL_QUERY_NETWORK_INTERFACE_INFO

[ Upstream commit a58b45a4dbfd0bf2ebb157789da4d8e6368afb1b ]

Set ipv4 and ipv6 address in FSCTL_QUERY_NETWORK_INTERFACE_INFO.

Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
index 2fb2df422d63c29f6627b462e2c6414c74002a54..17f7ef52e7b925e6e2ea66edcb414a9706157fd4 100644 (file)
--- a/fs/ksmbd/smb2pdu.c
+++ b/fs/ksmbd/smb2pdu.c
@@ -7328,15 +7328,10 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn,
        struct sockaddr_storage_rsp *sockaddr_storage;
        unsigned int flags;
        unsigned long long speed;
-       struct sockaddr_in6 *csin6 = (struct sockaddr_in6 *)&conn->peer_addr;
 
        rtnl_lock();
        for_each_netdev(&init_net, netdev) {
-               if (out_buf_len <
-                   nbytes + sizeof(struct network_interface_info_ioctl_rsp)) {
-                       rtnl_unlock();
-                       return -ENOSPC;
-               }
+               bool ipv4_set = false;
 
                if (netdev->type == ARPHRD_LOOPBACK)
                        continue;
@@ -7344,6 +7339,12 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn,
                flags = dev_get_flags(netdev);
                if (!(flags & IFF_RUNNING))
                        continue;
+ipv6_retry:
+               if (out_buf_len <
+                   nbytes + sizeof(struct network_interface_info_ioctl_rsp)) {
+                       rtnl_unlock();
+                       return -ENOSPC;
+               }
 
                nii_rsp = (struct network_interface_info_ioctl_rsp *)
                                &rsp->Buffer[nbytes];
@@ -7376,8 +7377,7 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn,
                                        nii_rsp->SockAddr_Storage;
                memset(sockaddr_storage, 0, 128);
 
-               if (conn->peer_addr.ss_family == PF_INET ||
-                   ipv6_addr_v4mapped(&csin6->sin6_addr)) {
+               if (!ipv4_set) {
                        struct in_device *idev;
 
                        sockaddr_storage->Family = cpu_to_le16(INTERNETWORK);
@@ -7388,6 +7388,9 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn,
                                continue;
                        sockaddr_storage->addr4.IPv4address =
                                                idev_ipv4_address(idev);
+                       nbytes += sizeof(struct network_interface_info_ioctl_rsp);
+                       ipv4_set = true;
+                       goto ipv6_retry;
                } else {
                        struct inet6_dev *idev6;
                        struct inet6_ifaddr *ifa;
@@ -7409,9 +7412,8 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn,
                                break;
                        }
                        sockaddr_storage->addr6.ScopeId = 0;
+                       nbytes += sizeof(struct network_interface_info_ioctl_rsp);
                }
-
-               nbytes += sizeof(struct network_interface_info_ioctl_rsp);
        }
        rtnl_unlock();