Thread (169 messages) 169 messages, 8 authors, 2023-02-10

Re: [PATCH 03/14] Move COMPAT_ATM_ADDPARTY to net/atm/svc.c

From: Thomas Huth <hidden>
Date: 2023-02-10 14:56:50
Also in: linux-arch, linux-fsdevel, lkml, netdev

Possibly related (same subject, not in this thread)

On 10/11/2015 02.31, Palmer Dabbelt wrote:
quoted hunk ↗ jump to hunk
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 <redacted>
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help