Re: [PATCH RESEND] wireless: Use offsetof instead of custom macro.
From: Nick Desaulniers
Date: Mon Dec 02 2019 - 12:27:51 EST
On Thu, Nov 28, 2019 at 8:05 PM Pi-Hsun Shih <pihsun@xxxxxxxxxxxx> wrote:
>
> On Thu, Nov 28, 2019 at 11:54 AM Joe Perches <joe@xxxxxxxxxxx> wrote:
> >
> > On Thu, 2019-11-28 at 11:39 +0800, Pi-Hsun Shih wrote:
> > > Use offsetof to calculate offset of a field to take advantage of
> > > compiler built-in version when possible, and avoid UBSAN warning when
> > > compiling with Clang:
> > []
> > > diff --git a/include/uapi/linux/wireless.h b/include/uapi/linux/wireless.h
> > []
> > > @@ -1090,8 +1090,7 @@ struct iw_event {
> > > /* iw_point events are special. First, the payload (extra data) come at
> > > * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second,
> > > * we omit the pointer, so start at an offset. */
> > > -#define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \
> > > - (char *) NULL)
> > > +#define IW_EV_POINT_OFF offsetof(struct iw_point, length)
> > > #define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \
> > > IW_EV_POINT_OFF)
> >
> > This is uapi. Is offsetof guaranteed to be available?
>
> offsetof is already used in other uapi headers
> (include/uapi/linux/fuse.h FUSE_NAME_OFFSET).
>
> Also offsetof is also defined back in C89 standard (in stddef.h), so
> it should be widely available and should be fine to use here?
> (Should I add a #ifndef __KERNEL__ #include <stddef.h> to the file?)
Yes, please, otherwise userspace could have a
-Wimplicit-function-definition warning from including this header,
since it would look like a function call to a previously undeclared
function.
Actually, it looks like include/uapi/linux/posix_types.h includes it
unconditionally, and many other headers under include/uapi/ include
include/uapi/linux/posix_types.h (unconditionally). So it may be ok
to just include stddef.h unconditionally, but please do so in addition
to the current diff you have.
--
Thanks,
~Nick Desaulniers