| Message ID | 1447119071-19392-4-git-send-email-palmer@dabbelt.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/11/2015 02.31, Palmer Dabbelt wrote: > This used to be behind an #ifdef COMPAT_COMPAT, so most of userspace > wouldn't have seen the definition before. Unfortunately this header > file became visible to userspace, so the definition has instead been > moved to net/atm/svc.c (the only user). > > Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com> > Reviewed-by: Andrew Waterman <waterman@eecs.berkeley.edu> > Reviewed-by: Albert Ou <aou@eecs.berkeley.edu> > --- > include/uapi/linux/atmdev.h | 4 ---- > net/atm/svc.c | 5 +++++ > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/include/uapi/linux/atmdev.h b/include/uapi/linux/atmdev.h > index 93e0ec0..3dcec70 100644 > --- a/include/uapi/linux/atmdev.h > +++ b/include/uapi/linux/atmdev.h > @@ -100,10 +100,6 @@ struct atm_dev_stats { > /* use backend to make new if */ > #define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf) > /* add party to p2mp call */ > -#ifdef CONFIG_COMPAT > -/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ > -#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf) > -#endif > #define ATM_DROPPARTY _IOW('a', ATMIOC_SPECIAL+5,int) > /* drop party from p2mp call */ > > diff --git a/net/atm/svc.c b/net/atm/svc.c > index 3fa0a9e..9e2e6ef 100644 > --- a/net/atm/svc.c > +++ b/net/atm/svc.c > @@ -27,6 +27,11 @@ > #include "signaling.h" > #include "addr.h" > > +#ifdef CONFIG_COMPAT > +/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ > +#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4, struct compat_atm_iobuf) > +#endif > + > static int svc_create(struct net *net, struct socket *sock, int protocol, > int kern); > Hi! The CONFIG_* switch is still there in the atmdev.h uapi header ... could somebody please pick this patch up to fix it? Thanks, Thomas
On Fri, Feb 10, 2023, at 15:55, Thomas Huth wrote: > On 10/11/2015 02.31, Palmer Dabbelt wrote: >> This used to be behind an #ifdef COMPAT_COMPAT, so most of userspace >> wouldn't have seen the definition before. Unfortunately this header >> file became visible to userspace, so the definition has instead been >> moved to net/atm/svc.c (the only user). >> >> Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com> >> Reviewed-by: Andrew Waterman <waterman@eecs.berkeley.edu> >> Reviewed-by: Albert Ou <aou@eecs.berkeley.edu> Reviewed-by: Arnd Bergmann <arnd@arndb.de> It took me a bit to figure out why there is a separate command code but no special handler for the compat structure, aside from being in the wrong file it does look correct. >> +#ifdef CONFIG_COMPAT >> +/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ >> +#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4, struct compat_atm_iobuf) >> +#endif We could actually drop the #ifdef here as well, or moving into the existing #ifdef. >> + >> static int svc_create(struct net *net, struct socket *sock, int protocol, >> int kern); > > The CONFIG_* switch is still there in the atmdev.h uapi header ... could > somebody please pick this patch up to fix it? It should get merged through the netdev tree, as Chas does not have a separate git tree for drivers/atm. I don't know what happened to the rest of the series, but if there are additional patches that got lost, merging them all through either the asm-generic or the mm tree would work as well. Any chance you or Palmer could rebase the series to 6.2-rc and see what remains? Arnd
diff --git a/include/uapi/linux/atmdev.h b/include/uapi/linux/atmdev.h index 93e0ec0..3dcec70 100644 --- a/include/uapi/linux/atmdev.h +++ b/include/uapi/linux/atmdev.h @@ -100,10 +100,6 @@ struct atm_dev_stats { /* use backend to make new if */ #define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf) /* add party to p2mp call */ -#ifdef CONFIG_COMPAT -/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ -#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf) -#endif #define ATM_DROPPARTY _IOW('a', ATMIOC_SPECIAL+5,int) /* drop party from p2mp call */ diff --git a/net/atm/svc.c b/net/atm/svc.c index 3fa0a9e..9e2e6ef 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -27,6 +27,11 @@ #include "signaling.h" #include "addr.h" +#ifdef CONFIG_COMPAT +/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ +#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4, struct compat_atm_iobuf) +#endif + static int svc_create(struct net *net, struct socket *sock, int protocol, int kern);