Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / core / filter.c

diff --git a/net/core/filter.c b/net/core/filter.c
index 255aeee..9ab94e9 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -4770,6 +4770,10 @@ static int _bpf_setsockopt(struct sock *sk, int level, int optname,
                                ifindex = dev->ifindex;
                                dev_put(dev);
                        }
+                       fallthrough;
+               case SO_BINDTOIFINDEX:
+                       if (optname == SO_BINDTOIFINDEX)
+                               ifindex = val;
                        ret = sock_bindtoindex(sk, ifindex, false);
                        break;
                case SO_KEEPALIVE:
@@ -4932,8 +4936,25 @@ static int _bpf_getsockopt(struct sock *sk, int level, int optname,
 
        sock_owned_by_me(sk);
 
+       if (level == SOL_SOCKET) {
+               if (optlen != sizeof(int))
+                       goto err_clear;
+
+               switch (optname) {
+               case SO_MARK:
+                       *((int *)optval) = sk->sk_mark;
+                       break;
+               case SO_PRIORITY:
+                       *((int *)optval) = sk->sk_priority;
+                       break;
+               case SO_BINDTOIFINDEX:
+                       *((int *)optval) = sk->sk_bound_dev_if;
+                       break;
+               default:
+                       goto err_clear;
+               }
 #ifdef CONFIG_INET
-       if (level == SOL_TCP && sk->sk_prot->getsockopt == tcp_getsockopt) {
+       } else if (level == SOL_TCP && sk->sk_prot->getsockopt == tcp_getsockopt) {
                struct inet_connection_sock *icsk;
                struct tcp_sock *tp;
 
@@ -4986,12 +5007,12 @@ static int _bpf_getsockopt(struct sock *sk, int level, int optname,
                default:
                        goto err_clear;
                }
+#endif
 #endif
        } else {
                goto err_clear;
        }
        return 0;
-#endif
 err_clear:
        memset(optval, 0, optlen);
        return -EINVAL;