Commit 16509081 authored by Anisse Astier's avatar Anisse Astier Committed by Will Deacon
Browse files

virtio: fix warning on strncpy



GCC 8.2 gives this warning:

virtio/net.c: In function ‘virtio_net__tap_init’:
virtio/net.c:336:47: error: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination? [-Werror=sizeof-pointer-memaccess]
   strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name));
                                               ^
virtio/net.c:348:47: error: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination? [-Werror=sizeof-pointer-memaccess]
   strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name));
                                               ^

Fix it by using sizeof of destination instead, even if they're the same
size in this case.
Reviewed-by: Andre Przywara's avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarAnisse Astier <aastier@freebox.fr>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 96eda741
......@@ -331,7 +331,7 @@ static bool virtio_net__tap_init(struct net_dev *ndev)
goto fail;
} else if (!skipconf) {
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name));
strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ifr.ifr_name));
sin.sin_addr.s_addr = inet_addr(params->host_ip);
memcpy(&(ifr.ifr_addr), &sin, sizeof(ifr.ifr_addr));
ifr.ifr_addr.sa_family = AF_INET;
......@@ -343,7 +343,7 @@ static bool virtio_net__tap_init(struct net_dev *ndev)
if (!skipconf) {
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name));
strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ifr.ifr_name));
ioctl(sock, SIOCGIFFLAGS, &ifr);
ifr.ifr_flags |= IFF_UP | IFF_RUNNING;
if (ioctl(sock, SIOCSIFFLAGS, &ifr) < 0)
......@@ -372,7 +372,7 @@ static void virtio_net__tap_exit(struct net_dev *ndev)
return;
sock = socket(AF_INET, SOCK_STREAM, 0);
strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ndev->tap_name));
strncpy(ifr.ifr_name, ndev->tap_name, sizeof(ifr.ifr_name));
ioctl(sock, SIOCGIFFLAGS, &ifr);
ifr.ifr_flags &= ~(IFF_UP | IFF_RUNNING);
if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment