diff --git a/drivers/staging/dst/export.c b/drivers/staging/dst/export.c
index c324230..4644804 100644
--- a/drivers/staging/dst/export.c
+++ b/drivers/staging/dst/export.c
@@ -166,12 +166,12 @@ static struct dst_state *dst_accept_client(struct dst_state *st)
 	}
 	new->socket = sock;
 
-	new->ctl.addr.sa_data_len = sizeof(struct sockaddr);
 	err = kernel_getpeername(sock, (struct sockaddr *)&new->ctl.addr,
 			(int *)&new->ctl.addr.sa_data_len);
 	if (err)
 		goto err_out_put;
 
+	new->ctl.addr.sa_data_len = sizeof(struct sockaddr);	
 	new->permissions = dst_check_permissions(st, new);
 	if (new->permissions == 0) {
 		err = -EPERM;
diff --git a/include/linux/dst.h b/include/linux/dst.h
index e26fed8..454b15a 100644
--- a/include/linux/dst.h
+++ b/include/linux/dst.h
@@ -74,10 +74,10 @@ struct saddr {
 	/* address family, AF_xxx	*/
 	unsigned short		sa_family;
 	/* 14 bytes of protocol address	*/
-	char			sa_data[SADDR_MAX_DATA];
+	char			sa_data[SADDR_MAX_DATA - sizeof(unsigned short)];
 	/* Number of bytes used in sa_data */
 	unsigned short		sa_data_len;
-};
+} __attribute__((aligned(16)));	/* sizeof(struct sockaddr) */
 
 /* Address structure */
 struct dst_network_ctl