diff options
| author |   Anton Ivanov <anton.ivanov@cambridgegreys.com> | 2018-03-05 13:29:05 +0000 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2018-03-29 22:18:02 +0200 |
| commit | e40238dedb484c8a19f8257e4ef5d77d038f9ad8 (patch) | |
| tree | 8bef9aea1db074cf8406f0c6da1d627da35e9449 /arch/um/drivers/vector_user.c | |
| parent | Migrate vector timers to new timer API (diff) | |
| download | linux-dev-e40238dedb484c8a19f8257e4ef5d77d038f9ad8.tar.xz linux-dev-e40238dedb484c8a19f8257e4ef5d77d038f9ad8.zip | |
Fix vector raw inintialization logic
Vector RAW in UML needs to BPF filter its own MAC only
if QDISC_BYPASS has failed. If QDISC_BYPASS is successful, the
frames originated locally are not visible to readers on the
raw socket.
Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/drivers/vector_user.c')
| -rw-r--r-- | arch/um/drivers/vector_user.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c index 4291f1a5d342..4d6a78e31089 100644 --- a/arch/um/drivers/vector_user.c +++ b/arch/um/drivers/vector_user.c @@ -41,7 +41,6 @@ #define TRANS_RAW "raw" #define TRANS_RAW_LEN strlen(TRANS_RAW) -#define QDISC_FAIL "user_init_raw: could not disable qdisc on interface" #define VNET_HDR_FAIL "could not enable vnet headers on fd %d" #define TUN_GET_F_FAIL "tapraw: TUNGETFEATURES failed: %s" #define L2TPV3_BIND_FAIL "l2tpv3_open : could not bind socket err=%i" @@ -212,8 +211,6 @@ static struct vector_fds *user_init_raw_fds(struct arglist *ifspec) int err = -ENOMEM; char *iface; struct vector_fds *result = NULL; - int optval = 1; - iface = uml_vector_fetch_arg(ifspec, TOKEN_IFNAME); if (iface == NULL) @@ -256,12 +253,6 @@ static struct vector_fds *user_init_raw_fds(struct arglist *ifspec) goto cleanup; } - if (setsockopt(txfd, - SOL_PACKET, PACKET_QDISC_BYPASS, - &optval, sizeof(optval)) != 0) { - printk(UM_KERN_INFO QDISC_FAIL); - } - result = uml_kmalloc(sizeof(struct vector_fds), UM_GFP_KERNEL); if (result != NULL) { result->rx_fd = rxfd; @@ -281,6 +272,19 @@ cleanup: return NULL; } + +bool uml_raw_enable_qdisc_bypass(int fd) +{ + int optval = 1; + + if (setsockopt(fd, + SOL_PACKET, PACKET_QDISC_BYPASS, + &optval, sizeof(optval)) != 0) { + return false; + } + return true; +} + bool uml_raw_enable_vnet_headers(int fd) { int optval = 1; |