misc: mic: Fix user space namespace pollution from mic_common.h.

Avoid declaring ALIGN() and __aligned() in include/uapi/linux/mic_common.h since they pollute user space namespace. Also, mic_aligned_size() can be simply replaced simply by sizeof() since all structures where mic_aligned_size() is used are declared using __attribute__ ((aligned(8))); -- >From mail from H Peter Anvin about this: On Fri, Nov 08, 2013 H Peter Anvin <h.peter.anvin@intel.com> wrote: Subject: Namespace pollution in mic_common.h This puts two macros, ALIGN() and __aligned(), into arbitrary user space namespace. This really isn't safe or acceptable, especially since those symbols are highly generic. ... When these structures are forced-aligned, they will in fact have padding automatically added by the compiler to an 8-byte boundary anyway, so mic_aligned_size() does nothing. ...

Ashutosh Dixit committed 12 years ago

Commit 1e31aa91 parent 286c2405 files · +17 −26Browse files

Showing the changes to include/uapi/linux (1 of 5 files). Show all

Unified · Split

include/uapi/linux/mic_common.h+9−17

 #include <linux/virtio_ring.h>
-#ifndef __KERNEL__
+#define __mic_align(a, x) (((a) + (x) - 1) & ~((x) - 1))
-#define ALIGN(a, x)	(((a) + (x) - 1) & ~((x) - 1))
-#define __aligned(x)	__attribute__ ((aligned(x)))
-#endif
-#define mic_aligned_size(x) ALIGN(sizeof(x), 8)
 /**
  * struct mic_device_desc: Virtio device information shared between the
 	__u8 config_len;
 	__u8 status;
 	__u64 config[0];
-} __aligned(8);
+} __attribute__ ((aligned(8)));
 /**
  * struct mic_device_ctrl: Per virtio device information in the device page
 	__u8 used_address_updated;
 	__s8 c2h_vdev_db;
 	__s8 h2c_vdev_db;
-} __aligned(8);
+} __attribute__ ((aligned(8)));
 /**
  * struct mic_bootparam: Virtio device independent information in device page
 	__s8 h2c_config_db;
 	__u8 shutdown_status;
 	__u8 shutdown_card;
-} __aligned(8);
+} __attribute__ ((aligned(8)));
 /**
  * struct mic_device_page: High level representation of the device page
 	__u64 address;
 	__u64 used_address;
 	__u16 num;
-} __aligned(8);
+} __attribute__ ((aligned(8)));
 /*
  * The alignment to use between consumer and producer parts of vring.
 	int len;
 };
-#define mic_aligned_desc_size(d) ALIGN(mic_desc_size(d), 8)
+#define mic_aligned_desc_size(d) __mic_align(mic_desc_size(d), 8)
 #ifndef INTEL_MIC_CARD
 static inline unsigned mic_desc_size(const struct mic_device_desc *desc)
 {
-	return mic_aligned_size(*desc)
+	return sizeof(*desc) + desc->num_vq * sizeof(struct mic_vqconfig)
-		+ desc->num_vq * mic_aligned_size(struct mic_vqconfig)
+		+ desc->feature_len * 2 + desc->config_len;
-		+ desc->feature_len * 2
-		+ desc->config_len;
 }
 static inline struct mic_vqconfig *
 }
 static inline unsigned mic_total_desc_size(struct mic_device_desc *desc)
 {
-	return mic_aligned_desc_size(desc) +
+	return mic_aligned_desc_size(desc) + sizeof(struct mic_device_ctrl);
-		mic_aligned_size(struct mic_device_ctrl);
 }
 #endif