2021년 12월 16일 (목) 오후 5:48, Namjae Jeon <linkinjeon@xxxxxxxxxx>님이 작성:
>
> Set ipv4 and ipv6 address in FSCTL_QUERY_NETWORK_INTERFACE_INFO.
>
> Signed-off-by: Namjae Jeon <linkinjeon@xxxxxxxxxx>
Acked-by: Hyunchul Lee <hyc.lee@xxxxxxxxx>
> ---
> v2:
> - move buffer check to under ipv6_retry to validate overflow.
>
> fs/ksmbd/smb2pdu.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c
> index 2ff4f813026e..0fbb62f9d509 100644
> --- a/fs/ksmbd/smb2pdu.c
> +++ b/fs/ksmbd/smb2pdu.c
> @@ -7224,15 +7224,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;
> @@ -7240,6 +7235,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];
> @@ -7272,8 +7273,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);
> @@ -7284,6 +7284,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;
> @@ -7305,9 +7308,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();
>
> --
> 2.25.1
>
--
Thanks,
Hyunchul
