diff options
-rw-r--r-- | net/packet/af_packet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 3616f27b9d46..0856a13cb53d 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
@@ -1719,7 +1719,7 @@ static int packet_getname_spkt(struct socket *sock, struct sockaddr *uaddr, | |||
1719 | rcu_read_lock(); | 1719 | rcu_read_lock(); |
1720 | dev = dev_get_by_index_rcu(sock_net(sk), pkt_sk(sk)->ifindex); | 1720 | dev = dev_get_by_index_rcu(sock_net(sk), pkt_sk(sk)->ifindex); |
1721 | if (dev) | 1721 | if (dev) |
1722 | strlcpy(uaddr->sa_data, dev->name, 15); | 1722 | strncpy(uaddr->sa_data, dev->name, 14); |
1723 | else | 1723 | else |
1724 | memset(uaddr->sa_data, 0, 14); | 1724 | memset(uaddr->sa_data, 0, 14); |
1725 | rcu_read_unlock(); | 1725 | rcu_read_unlock(); |
@@ -1742,6 +1742,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr, | |||
1742 | sll->sll_family = AF_PACKET; | 1742 | sll->sll_family = AF_PACKET; |
1743 | sll->sll_ifindex = po->ifindex; | 1743 | sll->sll_ifindex = po->ifindex; |
1744 | sll->sll_protocol = po->num; | 1744 | sll->sll_protocol = po->num; |
1745 | sll->sll_pkttype = 0; | ||
1745 | rcu_read_lock(); | 1746 | rcu_read_lock(); |
1746 | dev = dev_get_by_index_rcu(sock_net(sk), po->ifindex); | 1747 | dev = dev_get_by_index_rcu(sock_net(sk), po->ifindex); |
1747 | if (dev) { | 1748 | if (dev) { |