kernel-4.17.patch

   1 --- sysdig-0.21.0/driver/ppm_events.c~  2018-03-29 22:00:53.000000000 +0200
   2 +++ sysdig-0.21.0/driver/ppm_events.c   2018-06-18 20:45:33.813297584 +0200
   3 @@ -234,7 +234,11 @@
   4         if (sock) {
   5
   6                 if (sock->sk) {
   7 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
   8                         err = sock->ops->getname(sock, (struct sockaddr *)&sock_address, &sock_address_len, 0);
   9 +#else
  10 +                       err = sock->ops->getname(sock, (struct sockaddr *)&sock_address, 0);
  11 +#endif
  12
  13                         if (err == 0) {
  14                                 if(args->event_type == PPME_SOCKET_SENDTO_X)
  15 @@ -255,7 +259,11 @@
  16                                                 /*
  17                                                  * Suppose is a connected socket, fall back to fd
  18                                                  */
  19 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
  20                                                 err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
  21 +#else
  22 +                                               err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
  23 +#endif
  24                                         } else {
  25                                                 /*
  26                                                  * Get the address len
  27 @@ -275,7 +283,11 @@
  28                                                         /*
  29                                                          * This case should be very rare, fallback again to sock
  30                                                          */
  31 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
  32                                                         err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
  33 +#else
  34 +                                                       err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
  35 +#endif
  36                                                 }
  37                                         }
  38                                 } else if (args->event_type == PPME_SOCKET_SENDMSG_X) {
  39 @@ -328,9 +340,17 @@
  40                                                 /*
  41                                                  * Suppose it is a connected socket, fall back to fd
  42                                                  */
  43 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
  44                                                 err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
  45 +#else
  46 +                                               err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
  47 +#endif
  48                                 } else
  49 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
  50                                         err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
  51 +#else
  52 +                                       err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
  53 +#endif
  54
  55                                 if (err == 0) {
  56                                         family = sock->sk->sk_family;
  57 @@ -982,7 +1002,11 @@
  58                 return 0;
  59         }
  60
  61 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
  62         err = sock->ops->getname(sock, (struct sockaddr *)&sock_address, &sock_address_len, 0);
  63 +#else
  64 +       err = sock->ops->getname(sock, (struct sockaddr *)&sock_address, 0);
  65 +#endif
  66         ASSERT(err == 0);
  67
  68         family = sock->sk->sk_family;
  69 @@ -993,7 +1017,11 @@
  70         switch (family) {
  71         case AF_INET:
  72                 if (!use_userdata) {
  73 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
  74                         err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
  75 +#else
  76 +                       err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
  77 +#endif
  78                         if (err == 0) {
  79                                 if (is_inbound) {
  80                                         sip = ((struct sockaddr_in *) &peer_address)->sin_addr.s_addr;
  81 @@ -1045,7 +1073,11 @@
  82                 break;
  83         case AF_INET6:
  84                 if (!use_userdata) {
  85 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
  86                         err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
  87 +#else
  88 +                       err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
  89 +#endif
  90                         ASSERT(err == 0);
  91
  92                         if (is_inbound) {
  93 @@ -1120,7 +1152,11 @@
  94                         if (is_inbound) {
  95                                 us_name = ((struct sockaddr_un *) &sock_address)->sun_path;
  96                         } else {
  97 +#if LINUX_VERSION_CODE <= KERNEL_VERSION(4, 17, 0)
  98                                 err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, &peer_address_len, 1);
  99 +#else
 100 +                               err = sock->ops->getname(sock, (struct sockaddr *)&peer_address, 1);
 101 +#endif
 102                                 ASSERT(err == 0);
 103
 104                                 us_name = ((struct sockaddr_un *) &peer_address)->sun_path;