Attachment 166167 Details for Bug 206658 – patch for unaligned struct copy

[patch] patch for unaligned struct copy

pfctl_align.diff (text/plain), 1.18 KB, created by Ian Lepore on 2016-01-27 02:46:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Lepore

Created: 2016-01-27 02:46:04 UTC

Size: 1.18 KB

patch

obsolete

>Index: sbin/pfctl/pf_print_state.c
>===================================================================
>--- sbin/pfctl/pf_print_state.c	(revision 294860)
>+++ sbin/pfctl/pf_print_state.c	(working copy)
>@@ -146,7 +146,7 @@ print_name(struct pf_addr *addr, sa_family_t af)
> 		memset(&sin, 0, sizeof(sin));
> 		sin.sin_len = sizeof(sin);
> 		sin.sin_family = AF_INET;
>-		sin.sin_addr = addr->v4;
>+		memcpy(&sin.sin_addr, addr->v4, sizeof(sin.sin_addr));
> 		getnameinfo((struct sockaddr *)&sin, sin.sin_len,
> 		    host, sizeof(host), NULL, 0, NI_NOFQDN);
> 		break;
>@@ -157,7 +157,7 @@ print_name(struct pf_addr *addr, sa_family_t af)
> 		memset(&sin6, 0, sizeof(sin6));
> 		sin6.sin6_len = sizeof(sin6);
> 		sin6.sin6_family = AF_INET6;
>-		sin6.sin6_addr = addr->v6;
>+		memcpy(&sin6.sin6_addr, addr->v6, sizeof(sin6.sin6_addr));
> 		getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len,
> 		    host, sizeof(host), NULL, 0, NI_NOFQDN);
> 		break;
>@@ -175,7 +175,7 @@ print_host(struct pf_addr *addr, u_int16_t port, s
> 		struct pf_addr_wrap aw;
> 
> 		memset(&aw, 0, sizeof(aw));
>-		aw.v.a.addr = *addr;
>+		memcpy(&aw.v.a.addr, addr, sizeof(aw.v.a.addr));
> 		if (af == AF_INET)
> 			aw.v.a.mask.addr32[0] = 0xffffffff;
> 		else {

Actions: View | Diff

Attachments on bug 206658: 166167 | 166309