Hauke Mehrtens 162a93c20d
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:18:35 +01:00
2016-03-17 15:09:34 -07:00
2016-06-17 15:39:46 +02:00
2016-09-09 09:53:35 -03:00
2016-08-22 22:43:35 +02:00
2016-05-29 20:03:21 +01:00
2015-10-26 16:00:00 +01:00
2017-06-17 06:41:58 +02:00
2015-11-23 17:54:38 +01:00
2015-11-23 17:54:38 +01:00
2015-11-23 17:54:38 +01:00
2015-11-23 17:54:38 +01:00
2015-04-21 16:16:02 -04:00
2016-01-06 11:39:53 +11:00
2017-11-02 09:49:13 +01:00
2016-12-05 19:43:02 -05:00
2018-03-28 18:39:19 +02:00
2015-12-10 12:33:23 +01:00
2015-04-02 18:10:35 -03:00
2016-11-13 12:35:13 -05:00
2016-10-04 14:21:41 -07:00
2016-10-11 15:06:31 -07:00
2016-03-15 16:55:16 -07:00
2016-10-11 15:06:31 -07:00
2016-08-09 07:54:43 +02:00
2017-12-05 11:24:34 +01:00
2015-09-29 13:37:04 -07:00
2016-09-02 10:46:44 -07:00
2016-09-23 08:40:28 -04:00
2016-11-13 00:57:53 -05:00
2016-09-29 19:05:06 -05:00
2018-12-08 13:05:11 +01:00
2016-10-03 18:52:14 +02:00
2016-12-07 10:45:57 +01:00
2016-08-02 17:31:41 -04:00
2016-05-03 14:59:30 -07:00
2016-06-23 18:29:56 +08:00
2015-06-23 07:00:41 -07:00
2016-07-02 14:40:40 -04:00
2015-08-25 14:41:50 -05:00
2016-07-20 23:49:49 -04:00
2016-02-12 16:01:32 +01:00
2016-02-08 11:21:50 +11:00
2016-07-20 12:37:39 -07:00
2016-08-05 09:00:54 -04:00
2018-09-19 22:47:12 +02:00
2018-03-22 09:17:38 +01:00
2016-10-03 09:11:14 -07:00
2016-06-08 11:36:02 -07:00
2015-04-16 14:08:49 -04:00
2015-04-12 21:25:13 -04:00
2017-03-15 10:02:44 +08:00
2016-10-01 07:32:32 +02:00
2016-04-26 12:00:49 -04:00
2016-02-11 09:53:19 -05:00
2015-12-14 12:19:37 -06:00
2016-06-15 09:29:17 +02:00
2015-07-23 17:48:43 -07:00
2016-06-07 16:25:49 -07:00
2015-12-20 15:27:12 +02:00
2015-12-14 19:12:21 -08:00
2015-10-23 23:26:43 +02:00
2016-06-17 13:24:05 +02:00
2016-06-18 22:11:39 -07:00
2015-03-23 22:12:09 -04:00
2015-09-23 08:44:22 +02:00
2016-08-18 23:18:42 -07:00
2019-02-20 10:18:35 +01:00
2016-09-24 08:01:26 -04:00
2016-07-25 10:55:39 -07:00
2015-08-17 14:22:48 -07:00
2016-08-22 16:25:14 -07:00
2016-08-22 16:25:15 -07:00
2015-06-01 15:48:56 +02:00
2016-09-25 23:34:19 +02:00
2016-12-06 10:43:32 -05:00
2016-04-26 01:27:07 -04:00
2016-06-27 15:02:51 -04:00
2015-06-29 18:56:21 -07:00
2016-09-21 00:23:01 -04:00
2019-01-13 10:03:48 +01:00
2016-08-17 11:13:08 +02:00
2016-04-25 15:09:11 -04:00
2016-02-11 04:27:35 -05:00
2017-05-03 08:36:36 -07:00
2016-09-30 01:54:28 -04:00
2016-08-22 16:25:15 -07:00
2016-10-23 15:56:23 -07:00
2016-03-09 16:36:14 -05:00
2016-03-22 15:36:02 -07:00
2015-09-10 13:29:01 -07:00
2016-03-04 16:10:36 -05:00
2016-06-27 16:31:25 +01:00
2016-04-12 19:54:58 +01:00
2015-06-03 11:32:07 +03:00
2018-08-15 18:14:52 +02:00
2016-04-25 15:09:10 -04:00
2019-02-20 10:18:35 +01:00
2016-01-12 08:21:18 -07:00
2016-07-11 10:49:52 -03:00
2015-09-23 11:01:16 -06:00
2016-04-23 20:13:24 -04:00
2016-08-23 22:58:51 -07:00
2016-09-09 11:16:36 -03:00
2016-08-23 16:28:04 -03:00
2015-08-03 17:30:00 -07:00
2015-09-11 15:21:34 -07:00
2015-02-12 18:54:08 -08:00
2015-10-04 12:54:54 +01:00
2016-08-12 16:57:20 -07:00
2015-07-21 10:39:05 -07:00
2015-08-03 22:35:00 -07:00
2017-10-21 17:21:37 +02:00
2015-11-23 15:06:38 -05:00
2015-01-20 13:51:06 +01:00
2015-05-05 13:40:44 -06:00
2016-08-15 11:07:21 -07:00
2016-04-23 20:13:24 -04:00
2015-01-19 14:21:18 -05:00
2016-04-04 15:50:30 -04:00
2016-03-13 21:54:44 -04:00
2015-11-23 17:54:38 +01:00
2015-06-18 21:14:31 +02:00
2016-06-16 14:00:50 -07:00
2016-02-18 11:42:18 -05:00
2015-10-27 03:55:10 +01:00
2016-09-26 15:20:37 -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
2016-08-02 19:35:21 -04:00
2016-08-02 19:35:21 -04:00
2018-06-06 16:44:33 +02:00
2016-09-22 19:59:41 -05:00
2016-05-17 17:14:21 -06:00
2016-09-08 17:10:27 -07:00
2017-03-22 12:43:34 +01:00
2018-04-08 12:12:43 +02:00
2016-05-30 12:41:44 -03:00
2016-09-21 19:50:02 -04:00
2016-09-23 07:19:06 -04:00
2016-09-27 21:52:00 -04:00
2016-09-27 21:52:00 -04:00
2015-10-21 14:46:56 -06:00
2018-05-22 16:58:01 +02:00
2018-04-20 08:21:04 +02:00
2016-03-03 14:23:43 -08:00
2015-10-27 19:55:13 -07:00
2016-05-08 23:46:14 -04:00
2016-04-26 12:00:48 -04:00
2018-04-24 09:34:16 +02:00
2017-11-21 09:23:28 +01:00
2016-02-24 09:04:25 +01:00
2016-08-02 19:35:31 -04:00
2016-05-05 17:38:53 -07:00
2016-10-19 11:07:57 -04:00
2016-02-16 13:04:58 -05:00
2015-10-04 12:54:54 +01:00
2015-10-12 14:20:06 +01:00
2016-08-08 12:51:58 -07:00
2018-05-22 16:58:01 +02:00
2015-09-04 16:54:41 -07:00
2016-05-20 20:57:27 -07:00
2016-09-27 12:55:50 +02:00
2015-12-13 19:59:48 -08:00
2016-07-12 13:42:10 -03:00
2016-05-04 08:34:14 +02:00
2018-10-18 09:13:25 +02:00
2016-04-04 22:11:20 -04:00
2016-01-05 16:44:06 -05:00
2016-03-30 12:50:17 +02:00
2015-10-04 20:28:58 +01:00
2016-05-05 17:38:53 -07:00
2016-09-20 18:12:38 +05:30
2016-08-02 17:31:41 -04:00
2016-03-10 21:49:09 -08:00
2016-04-23 20:13:24 -04:00
2016-09-21 00:23:00 -04:00
2015-02-09 13:20:47 -08:00
2016-08-26 21:38:41 -07:00
2016-07-26 14:26:42 -07:00
2015-07-24 14:15:10 -07:00
2016-04-30 09:26:55 -07:00
2015-06-11 23:37:37 +02:00
2016-05-10 12:25:04 -04:00
2015-12-18 17:48:51 -08:00
2016-03-05 12:05:01 -08:00
2015-10-01 21:42:35 -04:00
2015-10-27 18:55:31 -07:00
2016-05-20 17:58:30 -07:00
2016-02-01 08:47:05 -02:00
2016-02-19 08:10:35 -02:00
2016-09-19 14:34:41 -03:00
2015-06-05 11:45:45 -03:00
2015-03-23 11:44:35 -07:00
2016-02-22 16:10:09 -07:00
2016-08-02 16:53:54 +03:00
2017-02-23 17:44:37 +01:00
2016-03-17 15:09:34 -07:00
2016-03-02 17:01:59 +02:00
2016-08-01 21:44:52 +03:00
2015-12-10 12:33:23 +01:00
2016-08-02 02:57:29 +03:00
2015-03-29 12:13:52 +10:30
2016-06-10 23:03:55 -07: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
2016-08-09 13:42:38 +03:00
2016-04-30 09:26:55 -07:00
2016-06-25 17:26:35 +03:00
2016-06-09 10:14:39 +02:00
2016-09-09 09:10:07 +02:00
2015-04-03 01:04:18 -03:00
162a93c20d