| ifmac.c (288305) | ifmac.c (299873) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Networks Associates Technology, Inc. 3 * All rights reserved. 4 * 5 * This software was developed for the FreeBSD Project by NAI Labs, the 6 * Security Research Division of Network Associates, Inc. under 7 * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA 8 * CHATS research program. --- 17 unchanged lines hidden (view full) --- 26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * | 1/*- 2 * Copyright (c) 2001 Networks Associates Technology, Inc. 3 * All rights reserved. 4 * 5 * This software was developed for the FreeBSD Project by NAI Labs, the 6 * Security Research Division of Network Associates, Inc. under 7 * DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA 8 * CHATS research program. --- 17 unchanged lines hidden (view full) --- 26 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 27 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 28 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 29 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 30 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 31 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 32 * SUCH DAMAGE. 33 * |
| 34 * $FreeBSD: head/sbin/ifconfig/ifmac.c 288305 2015-09-27 07:51:18Z ngie $ | 34 * $FreeBSD: head/sbin/ifconfig/ifmac.c 299873 2016-05-16 00:25:24Z truckman $ |
| 35 */ 36 37#include <sys/param.h> 38#include <sys/ioctl.h> 39#include <sys/mac.h> 40#include <sys/socket.h> 41#include <sys/sockio.h> 42 --- 9 unchanged lines hidden (view full) --- 52static void 53maclabel_status(int s) 54{ 55 struct ifreq ifr; 56 mac_t label; 57 char *label_text; 58 59 memset(&ifr, 0, sizeof(ifr)); | 35 */ 36 37#include <sys/param.h> 38#include <sys/ioctl.h> 39#include <sys/mac.h> 40#include <sys/socket.h> 41#include <sys/sockio.h> 42 --- 9 unchanged lines hidden (view full) --- 52static void 53maclabel_status(int s) 54{ 55 struct ifreq ifr; 56 mac_t label; 57 char *label_text; 58 59 memset(&ifr, 0, sizeof(ifr)); |
| 60 strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); | 60 strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); |
| 61 62 if (mac_prepare_ifnet_label(&label) == -1) 63 return; 64 ifr.ifr_ifru.ifru_data = (void *)label; 65 if (ioctl(s, SIOCGIFMAC, &ifr) == -1) 66 goto mac_free; 67 68 --- 16 unchanged lines hidden (view full) --- 85 int error; 86 87 if (mac_from_text(&label, val) == -1) { 88 perror(val); 89 return; 90 } 91 92 memset(&ifr, 0, sizeof(ifr)); | 61 62 if (mac_prepare_ifnet_label(&label) == -1) 63 return; 64 ifr.ifr_ifru.ifru_data = (void *)label; 65 if (ioctl(s, SIOCGIFMAC, &ifr) == -1) 66 goto mac_free; 67 68 --- 16 unchanged lines hidden (view full) --- 85 int error; 86 87 if (mac_from_text(&label, val) == -1) { 88 perror(val); 89 return; 90 } 91 92 memset(&ifr, 0, sizeof(ifr)); |
| 93 strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); | 93 strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); |
| 94 ifr.ifr_ifru.ifru_data = (void *)label; 95 96 error = ioctl(s, SIOCSIFMAC, &ifr); 97 mac_free(label); 98 if (error == -1) 99 perror("setifmac"); 100} 101 --- 18 unchanged lines hidden --- | 94 ifr.ifr_ifru.ifru_data = (void *)label; 95 96 error = ioctl(s, SIOCSIFMAC, &ifr); 97 mac_free(label); 98 if (error == -1) 99 perror("setifmac"); 100} 101 --- 18 unchanged lines hidden --- |