| Message ID | 20170220181533.GA11185@altlinux.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Kalle Valo |
| Headers | show |
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.
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 */
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(-)