Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1584811 > unrolled thread

[PATCH 1/2] uapi: fix definition of struct sockaddr_nfc_llcp on x32 and mips n32

Started by"Dmitry V. Levin" <ldv@altlinux.org>
First post2017-02-20 19:20 +0100
Last post2017-02-20 22:30 +0100
Articles 2 — 1 participant

Back to article view | Back to linux.kernel


Contents

  [PATCH 1/2] uapi: fix definition of struct sockaddr_nfc_llcp on x32 and mips n32 "Dmitry V. Levin" <ldv@altlinux.org> - 2017-02-20 19:20 +0100
    Re: [PATCH 1/2] uapi: fix definition of struct sockaddr_nfc_llcp on x32 and mips n32 "Dmitry V. Levin" <ldv@altlinux.org> - 2017-02-20 22:30 +0100

#1584811 — [PATCH 1/2] uapi: fix definition of struct sockaddr_nfc_llcp on x32 and mips n32

From"Dmitry V. Levin" <ldv@altlinux.org>
Date2017-02-20 19:20 +0100
Subject[PATCH 1/2] uapi: fix definition of struct sockaddr_nfc_llcp on x32 and mips n32
Message-ID<td0J4-87X-9@gated-at.bofh.it>
Replace size_t with __kernel_size_t to fix definition of struct
sockaddr_nfc_llcp on architectures like x32 and mips n32 where
sizeof(size_t) < sizeof(__kernel_size_t).

This also fixes the following linux/nfc.h userspace compilation error:

/usr/include/linux/nfc.h:279:2: error: unknown type name 'size_t'
  size_t service_name_len;

Cc: stable@vger.kernel.org
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
 include/uapi/linux/nfc.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h
index 399f39f..f8ccc12 100644
--- a/include/uapi/linux/nfc.h
+++ b/include/uapi/linux/nfc.h
@@ -276,7 +276,7 @@ struct sockaddr_nfc_llcp {
 	__u8 dsap; /* Destination SAP, if known */
 	__u8 ssap; /* Source SAP to be bound to */
 	char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */;
-	size_t service_name_len;
+	__kernel_size_t service_name_len;
 };
 
 /* NFC socket protocols */
-- 
ldv

[toc] | [next] | [standalone]


#1584916

From"Dmitry V. Levin" <ldv@altlinux.org>
Date2017-02-20 22:30 +0100
Message-ID<td3GV-1vZ-11@gated-at.bofh.it>
In reply to#1584811
On Mon, Feb 20, 2017 at 09:15:33PM +0300, Dmitry V. Levin wrote:
> Replace size_t with __kernel_size_t to fix definition of struct
> sockaddr_nfc_llcp on architectures like x32 and mips n32 where
> sizeof(size_t) < sizeof(__kernel_size_t).
> 
> This also fixes the following linux/nfc.h userspace compilation error:
> 
> /usr/include/linux/nfc.h:279:2: error: unknown type name 'size_t'
>   size_t service_name_len;
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> ---
>  include/uapi/linux/nfc.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/uapi/linux/nfc.h b/include/uapi/linux/nfc.h
> index 399f39f..f8ccc12 100644
> --- a/include/uapi/linux/nfc.h
> +++ b/include/uapi/linux/nfc.h
> @@ -276,7 +276,7 @@ struct sockaddr_nfc_llcp {
>  	__u8 dsap; /* Destination SAP, if known */
>  	__u8 ssap; /* Source SAP to be bound to */
>  	char service_name[NFC_LLCP_MAX_SERVICE_NAME]; /* Service name URI */;
> -	size_t service_name_len;
> +	__kernel_size_t service_name_len;
>  };
>  
>  /* NFC socket protocols */

Unfortunately, this is not the right fix for the problem.

It was definitely a bad idea to use architecture dependent types
in the definition of struct sockaddr_nfc_llcp.  Somebody will have
to implement a compat layer to make it work properly with x86, x32,
and other compat personalities.


-- 
ldv

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web