/* * netsniff-ng - the packet sniffing beast * Copyright 2012 Markus Amend , Deutsche Flugsicherung GmbH * Subject to the GPL, version 2. * * http://tools.ietf.org/html/rfc3032 */ #include #include #include /* for ntohs() */ #include #include "proto.h" #include "dissector_eth.h" #include "built_in.h" #include "pkt_buff.h" struct mpls_uchdr { uint32_t mpls_uc_hdr; } __packed; static int mpls_uc_next_proto(struct pkt_buff *pkt) { uint8_t proto; uint16_t key = 0; if (pkt_len(pkt)) proto = *(pkt->data); else return -EIO; /* FIXME: Right now only test for IP Version field */ switch (proto >> 4) { case 4: key = 0x0800; /* IPv4*/ break; case 6: key = 0x86DD; /* IPv6*/ break; default: /* Nothing detected ... */ return -ENOENT; } return key; } static void mpls_uc_full(struct pkt_buff *pkt) { int next; uint32_t mpls_uc_data; struct mpls_uchdr *mpls_uc; uint8_t s = 0; do { mpls_uc = (struct mpls_uchdr *) pkt_pull(pkt, sizeof(*mpls_uc)); if (mpls_uc == NULL) return; mpls_uc_data = ntohl(mpls_uc->mpls_uc_hdr); s = (mpls_uc_data >> 8) & 0x1; tprintf(" [ MPLS "); tprintf("Label (%u), ", mpls_uc_data >> 12); tprintf("Exp (%u), ", (mpls_uc_data >> 9) & 0x7); tprintf("S (%u), ", s); tprintf("TTL (%u)", (mpls_uc_data & 0xFF)); tprintf(" ]\n"); } while (!s); next = mpls_uc_next_proto(pkt); if (next < 0) return; pkt_set_dissector(pkt, ð_lay2, (uint16_t) next); } static void mpls_uc_less(struct pkt_buff *pkt) { int next; uint32_t mpls_uc_data; struct mpls_uchdr *mpls_uc; uint8_t s = 0; do { mpls_uc = (struct mpls_uchdr *) pkt_pull(pkt, sizeof(*mpls_uc)); if (mpls_uc == NULL) return; mpls_uc_data = ntohl(mpls_uc->mpls_uc_hdr); s = (mpls_uc_data >> 8) & 0x1; tprintf(" MPLS/%u", mpls_uc_data >> 12); } while (!s); next = mpls_uc_next_proto(pkt); if (next < 0) return; pkt_set_dissector(pkt, ð_lay2, (uint16_t) next); } struct protocol mpls_uc_ops = { .key = 0x8847, .print_full = mpls_uc_full, .print_less = mpls_uc_less, }; 0efcec575aa69483439fc6fda'>diff
diff options
context:
space:
mode:
authorRussell King - ARM Linux <linux@armlinux.org.uk>2016-06-30 10:36:15 +0100
committerDavid S. Miller <davem@davemloft.net>2016-07-01 05:59:39 -0400
commit3d8c4530e50dc030efcec575aa69483439fc6fda (patch)
tree5f3261e713378481b33b27483fd54b1fe812146e
parentf95ae8a0edba1cb85110df4f1c96786419a0472f (diff)
net: mvneta: fix open() error cleanup
If mvneta_mdio_probe() fails, a kernel warning is triggered due to missing cleanup in the error path. Add the necessary cleanup. ------------[ cut here ]------------ WARNING: CPU: 1 PID: 281 at kernel/irq/manage.c:1814 __free_percpu_irq+0xfc/0x130 percpu IRQ 38 still enabled on CPU0! Modules linked in: bnep bluetooth xhci_plat_hcd xhci_hcd marvell_cesa armada_thermal des_generic ehci_orion mcp3021 spi_orion sfp mdio_i2c evbug fuse CPU: 1 PID: 281 Comm: connmand Not tainted 4.7.0-rc2+ #53 Hardware name: Marvell Armada 380/385 (Device Tree) Backtrace: [<c0013488>] (dump_backtrace) from [<c00137d0>] (show_stack+0x18/0x1c) r6:60010093 r5:ffffffff r4:00000000 r3:dc8ba500 [<c00137b8>] (show_stack) from [<c02c6fe0>] (dump_stack+0xa4/0xdc) [<c02c6f3c>] (dump_stack) from [<c002d4ec>] (__warn+0xd8/0x104) r6:c081e6a0 r5:00000000 r4:edfe5d50 r3:dc8ba500 [<c002d414>] (__warn) from [<c002d5d0>] (warn_slowpath_fmt+0x40/0x48) r10:a0010013 r8:c09356f8 r7:00000026 r6:ef11a260 r5:edd7b980 r4:ef11a200 [<c002d594>] (warn_slowpath_fmt) from [<c008c8e0>] (__free_percpu_irq+0xfc/0x130) r3:00000026 r2:c081e7ac [<c008c7e4>] (__free_percpu_irq) from [<c008c95c>] (free_percpu_irq+0x48/0x74) r10:00008914 r8:00000000 r7:ffffffed r6:c09356f8 r5:00000026 r4:ef11a200 [<c008c914>] (free_percpu_irq) from [<c043dd70>] (mvneta_open+0x118/0x134) r6:ffffffed r5:ef01e640 r4:ef01e000 r3:ef01e000 [<c043dc58>] (mvneta_open) from [<c055f5b4>] (__dev_open+0xa4/0x108) r7:ef01e030 r6:c06ff3d8 r5:ffff9003 r4:ef01e000 [<c055f510>] (__dev_open) from [<c055f844>] (__dev_change_flags+0x94/0x150) r7:00001002 r6:00000001 r5:ffff9003 r4:ef01e000 [<c055f7b0>] (__dev_change_flags) from [<c055f938>] (dev_change_flags+0x20/0x50) r8:00000000 r7:c09334c8 r6:00001002 r5:00000148 r4:ef01e000 r3:00008914 [<c055f918>] (dev_change_flags) from [<c05de044>] (devinet_ioctl+0x6f4/0x7e0) r8:00000000 r7:c09334c8 r6:00000000 r5:ee87200c r4:00000000 r3:00008914 [<c05dd950>] (devinet_ioctl) from [<c05e0168>] (inet_ioctl+0x1b8/0x1c8) r10:beb4499c r9:edfe4000 r8:ecf13280 r7:c096cf00 r6:beb4499c r5:eef7c240 r4:00008914 [<c05dffb0>] (inet_ioctl) from [<c053c898>] (sock_ioctl+0x78/0x300) [<c053c820>] (sock_ioctl) from [<c0155ecc>] (do_vfs_ioctl+0x98/0xa60) r7:00000011 r6:00008914 r5:00000011 r4:c01568d0 [<c0155e34>] (do_vfs_ioctl) from [<c01568d0>] (SyS_ioctl+0x3c/0x60) r10:00000000 r9:edfe4000 r8:beb4499c r7:00000011 r6:00008914 r5:ecf13280 r4:ecf13280 [<c0156894>] (SyS_ioctl) from [<c000fe60>] (ret_fast_syscall+0x0/0x1c) r8:c0010004 r7:00000036 r6:00000011 r5:000a2978 r4:00000000 r3:00009003 ---[ end trace 711f625d5b04b3a7 ]--- Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Tested-by: Jon Nettleton <jon@solid-run.com> Signed-off-by: David S. Miller <davem@davemloft.net>