Hauke Mehrtens cb4f43bf87
uapi/if_ether.h: move __UAPI_DEF_ETHHDR libc define ...
commit da360299b6734135a5f66d7db458dcc7801c826a upstream.
This fixes a compile problem of some user space applications by not
including linux/libc-compat.h in uapi/if_ether.h.
linux/libc-compat.h checks which "features" the header files, included
from the libc, provide to make the Linux kernel uapi header files only
provide no conflicting structures and enums. If a user application mixes
kernel headers and libc headers it could happen that linux/libc-compat.h
gets included too early where not all other libc headers are included
yet. Then the linux/libc-compat.h would not prevent all the
redefinitions and we run into compile problems.
This patch removes the include of linux/libc-compat.h from
uapi/if_ether.h to fix the recently introduced case, but not all as this
is more or less impossible.
It is no problem to do the check directly in the if_ether.h file and not
in libc-compat.h as this does not need any fancy glibc header detection
as glibc never provided struct ethhdr and should define
__UAPI_DEF_ETHHDR by them self when they will provide this.
The following test program did not compile correctly any more:
#include <linux/if_ether.h>
#include <netinet/in.h>
#include <linux/in.h>
int main(void)
{
return 0;
}
Fixes: 6926e041a892 ("uapi/if_ether.h: prevent redefinition of struct ethhdr")
Reported-by: Guillaume Nault <g.nault@alphalink.fr >
Cc: <stable@vger.kernel.org > # 4.15
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de >
Signed-off-by: David S. Miller <davem@davemloft.net >
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com >
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org >
2019-02-20 10:13:24 +01:00
2014-10-20 10:30:15 +08:00
2015-10-13 17:42:34 +02:00
2015-06-09 17:47:38 -03:00
2014-09-23 23:15:46 -07:00
2015-06-23 02:40:03 +02:00
2015-09-23 20:23:25 +01:00
2015-10-26 16:00:00 +01:00
2015-10-05 17:32:14 +02:00
2014-08-20 15:13:08 +02:00
2015-06-23 14:08:54 -07:00
2014-06-25 19:28:43 +02:00
2015-08-26 20:32:35 +02:00
2015-04-21 16:16:02 -04:00
2015-11-01 13:48:26 +11:00
2017-11-02 09:40:49 +01:00
2015-03-20 19:10:44 -04:00
2018-03-28 18:40:12 +02:00
2015-04-02 18:10:35 -03:00
2014-01-07 13:50:28 +01:00
2015-10-05 03:16:46 -07:00
2015-09-08 13:34:59 -07:00
2017-12-05 11:22:51 +01:00
2015-09-29 13:37:04 -07:00
2014-10-14 16:06:45 -04:00
2015-11-02 22:48:39 -05:00
2014-07-01 10:48:05 -06:00
2015-10-26 19:38:30 -07:00
2016-12-15 08:49:22 -08:00
2014-04-22 21:42:27 -04:00
2014-03-20 14:55:18 +01:00
2015-06-22 15:49:27 +08:00
2015-06-23 07:00:41 -07:00
2015-08-25 14:41:50 -05:00
2014-11-19 14:48:02 -06:00
2015-10-31 19:05:59 -04:00
2014-01-21 23:46:27 -05:00
2014-01-23 16:36:55 -08:00
2015-09-10 06:54:15 +02:00
2014-11-28 10:19:49 +00:00
2014-08-05 16:35:54 -07:00
2018-09-19 22:48:56 +02:00
2018-01-31 12:06:12 +01:00
2015-03-25 15:07:05 +11:00
2014-08-08 15:57:31 -07:00
2014-01-17 11:12:06 +01:00
2015-07-21 10:39:06 -07:00
2015-04-16 14:08:49 -04:00
2015-04-12 21:25:13 -04:00
2015-10-17 16:15:18 -04:00
2015-07-01 16:26:08 +02:00
2013-11-28 18:26:30 -05:00
2014-05-14 10:04:34 +01:00
2015-07-23 17:48:43 -07:00
2013-11-03 23:20:14 -05:00
2016-09-15 08:27:40 +02:00
2015-10-23 23:26:43 +02:00
2015-06-01 08:07:08 +09:00
2014-07-09 16:41:36 -07:00
2015-03-23 22:12:09 -04:00
2014-12-05 23:56:55 +08:00
2015-09-23 08:44:22 +02:00
2013-12-11 12:57:55 -08:00
2015-09-29 13:36:06 -07:00
2019-02-20 10:13:24 +01:00
2014-04-27 19:08:06 -04:00
2015-10-30 12:10:51 +09:00
2015-08-17 14:22:48 -07:00
2015-06-01 15:48:56 +02:00
2015-08-10 14:03:54 -07:00
2016-05-18 17:06:43 -07:00
2015-08-17 21:33:06 -07:00
2014-12-22 16:12:36 -05:00
2015-06-29 18:56:21 -07:00
2015-06-24 02:51:39 -07:00
2019-01-13 10:05:31 +01:00
2015-10-26 19:06:48 -07:00
2015-08-21 09:10:11 -07:00
2015-06-24 02:15:54 -07:00
2017-05-02 21:19:53 -07:00
2015-08-13 21:27:19 -07:00
2016-03-03 15:07:24 -08:00
2014-12-02 13:52:53 -07:00
2015-09-10 13:29:01 -07:00
2015-02-17 14:34:51 -08:00
2015-06-03 11:32:07 +03:00
2014-05-30 21:01:11 +02:00
2018-04-29 07:50:02 +02:00
2014-12-31 14:17:20 -05:00
2019-02-20 10:13:24 +01:00
2015-10-29 16:21:42 +09:00
2015-09-23 11:01:16 -06:00
2015-09-24 14:31:37 -07:00
2015-11-02 22:48:39 -05:00
2013-11-06 23:32:59 -08:00
2015-04-21 09:44:55 -03:00
2015-02-26 08:40:10 -03:00
2015-08-03 17:30:00 -07:00
2015-09-11 15:21:34 -07:00
2014-08-08 15:57:31 -07:00
2015-02-12 18:54:08 -08:00
2015-10-04 12:54:54 +01:00
2014-02-07 15:30:34 -08:00
2015-07-21 10:39:05 -07:00
2015-08-03 22:35:00 -07:00
2014-01-20 14:45:33 -08:00
2017-10-21 17:09:06 +02:00
2015-01-20 13:51:06 +01:00
2014-12-13 12:42:52 -08:00
2015-05-05 13:40:44 -06:00
2015-07-27 22:53:19 -04:00
2015-08-10 13:46:21 -07:00
2015-01-19 14:21:18 -05:00
2015-02-02 18:46:51 -08:00
2015-07-08 23:34:53 -07:00
2014-07-15 16:12:01 -07:00
2015-06-18 21:14:31 +02:00
2017-03-22 12:04:13 +01:00
2017-03-22 12:04:13 +01:00
2015-10-27 03:55:10 +01:00
2015-08-27 19:44:53 -04:00
2015-04-23 15:16:14 -04:00
2015-11-23 21:53:08 -05:00
2015-07-20 14:58:46 -04:00
2018-06-06 16:46:21 +02:00
2015-10-09 10:40:37 -06:00
2015-12-14 14:00:09 -05:00
2017-03-22 12:04:16 +01:00
2018-04-08 11:51:57 +02:00
2015-11-04 09:41:05 -08:00
2014-02-17 07:18:19 +01:00
2015-09-17 21:09:07 -07:00
2015-05-12 18:22:49 -04:00
2014-01-23 16:36:55 -08:00
2015-10-21 14:46:56 -06:00
2018-07-25 10:18:27 +02:00
2015-10-02 14:35:17 +01:00
2014-03-21 14:21:13 -04:00
2015-10-27 19:55:13 -07:00
2015-03-18 21:55:08 +01:00
2014-08-05 16:41:22 -04:00
2017-11-21 09:21:23 +01:00
2014-01-20 14:44:17 -08:00
2016-11-15 07:46:38 +01:00
2014-11-16 10:58:53 +01:00
2015-10-04 12:54:54 +01:00
2015-10-12 14:20:06 +01:00
2014-07-16 14:40:04 -07:00
2018-07-25 10:18:27 +02:00
2015-09-04 16:54:41 -07:00
2014-12-13 12:42:52 -08:00
2015-06-10 17:34:26 -07:00
2015-05-20 09:01:20 -07:00
2015-03-07 03:39:55 +01:00
2014-07-20 14:33:23 -07:00
2014-06-06 16:08:14 -07:00
2014-08-21 15:25:11 -05:00
2019-02-08 11:25:32 +01:00
2015-06-15 19:49:22 -07:00
2013-11-19 19:07:21 +00:00
2015-10-04 20:28:58 +01:00
2014-12-10 17:41:10 -08:00
2015-09-11 00:32:36 -07:00
2014-02-26 17:08:40 -05:00
2015-05-21 23:25:21 -04:00
2014-12-09 14:10:41 +08:00
2014-01-20 14:44:05 -08:00
2015-02-09 13:20:47 -08:00
2015-03-05 22:08:42 -05:00
2014-04-26 12:13:24 -04:00
2015-07-24 14:15:10 -07:00
2015-05-24 12:49:16 -07:00
2015-06-11 23:37:37 +02:00
2014-05-23 16:28:53 -04:00
2014-08-25 03:28:08 -05:00
2015-01-11 16:27:25 -08:00
2013-11-28 18:16:43 -05:00
2015-01-31 09:05:06 -08:00
2014-08-25 10:40:06 -07:00
2015-10-01 21:42:35 -04:00
2015-10-27 18:55:31 -07:00
2014-12-04 12:37:01 -02:00
2015-10-20 15:37:56 -02:00
2016-05-04 14:48:48 -07:00
2015-06-05 11:45:45 -03:00
2015-03-23 11:44:35 -07:00
2015-12-04 08:38:42 -07:00
2015-06-01 15:48:55 +02:00
2016-09-15 08:27:45 +02:00
2015-06-01 15:46:54 +02:00
2015-03-10 11:48:29 +10:30
2015-02-11 15:03:16 +10:30
2014-12-09 12:06:32 +02:00
2015-10-16 10:44:02 +02:00
2015-06-03 14:17:38 +02:00
2015-03-29 12:13:52 +10:30
2015-07-01 10:11:17 +02:00
2015-07-07 14:27:05 +03:00
2015-07-07 14:27:04 +03:00
2015-03-13 15:55:43 +10:30
2014-12-09 12:05:24 +02:00
2015-07-06 08:25:50 -03:00
2014-11-05 20:18:30 -08:00
2014-10-02 14:23:14 -04:00
2014-08-29 16:28:16 -07:00
2015-03-31 13:58:35 -04:00
2015-04-03 01:04:18 -03:00
2013-11-26 11:09:08 +01:00
2013-11-26 11:09:09 +01:00
cb4f43bf87