Index: uspace/srv/devman/devman.c =================================================================== --- uspace/srv/devman/devman.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/devman/devman.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -266,9 +266,10 @@ } - if (read(fd, buf, len) <= 0) { + ssize_t read_bytes = safe_read(fd, buf, len); + if (read_bytes <= 0) { printf(NAME ": unable to read file '%s'.\n", conf_path); goto cleanup; } - buf[len] = 0; + buf[read_bytes] = 0; suc = parse_match_ids(buf, ids); @@ -1123,4 +1124,11 @@ fun_node_t *find_fun_node_by_path(dev_tree_t *tree, char *path) { + assert(path != NULL); + + bool is_absolute = path[0] == '/'; + if (!is_absolute) { + return NULL; + } + fibril_rwlock_read_lock(&tree->rwlock); @@ -1132,5 +1140,5 @@ char *rel_path = path; char *next_path_elem = NULL; - bool cont = (rel_path[0] == '/'); + bool cont = true; while (cont && fun != NULL) { Index: uspace/srv/devman/main.c =================================================================== --- uspace/srv/devman/main.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/devman/main.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -477,5 +477,11 @@ dev = fun->dev; - if (fun == NULL && dev == NULL) { + /* + * For a valid function to connect to we need a device. The root + * function, for example, has no device and cannot be connected to. + * This means @c dev needs to be valid regardless whether we are + * connecting to a device or to a function. + */ + if (dev == NULL) { printf(NAME ": devman_forward error - no device or function with " "handle %" PRIun " was found.\n", handle); Index: uspace/srv/devman/util.c =================================================================== --- uspace/srv/devman/util.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/devman/util.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -111,4 +111,31 @@ } +ssize_t safe_read(int fd, void *buffer, size_t size) +{ + if (size == 0) { + return 0; + } + + uint8_t *buf_ptr = (uint8_t *) buffer; + + size_t total_read = 0; + while (total_read < size) { + ssize_t bytes_read = read(fd, buf_ptr, size - total_read); + if (bytes_read < 0) { + /* Error. */ + return bytes_read; + } else if (bytes_read == 0) { + /* Possibly end of file. */ + break; + } else { + /* Read at least something. */ + buf_ptr += bytes_read; + total_read += bytes_read; + } + } + + return (ssize_t) total_read; +} + /** @} */ Index: uspace/srv/devman/util.h =================================================================== --- uspace/srv/devman/util.h (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/devman/util.h (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -47,4 +47,6 @@ extern void replace_char(char *, char, char); +extern ssize_t safe_read(int, void *, size_t); + #endif Index: uspace/srv/hid/kbd/Makefile =================================================================== --- uspace/srv/hid/kbd/Makefile (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hid/kbd/Makefile (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -78,5 +78,5 @@ SOURCES += \ port/pl050.c \ - ctl/pl050.c + ctl/pc.c endif endif Index: uspace/srv/hid/kbd/ctl/pl050.c =================================================================== --- uspace/srv/hid/kbd/ctl/pl050.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ (revision ) @@ -1,267 +1,0 @@ -/* - * Copyright (c) 2009 Vineeth Pillai - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup kbd_ctl - * @ingroup kbd - * @{ - */ -/** - * @file - * @brief PL050 keyboard controller driver. - */ - -#include -#include -#include -#include -#include -#include - -#define PL050_CAPS_SCAN_CODE 0x58 -#define PL050_NUM_SCAN_CODE 0x77 -#define PL050_SCROLL_SCAN_CODE 0x7E - -static bool is_lock_key(int); -enum dec_state { - ds_s, - ds_e -}; - -static enum dec_state ds; - -static int scanmap_simple[] = { - - [0x0e] = KC_BACKTICK, - - [0x16] = KC_1, - [0x1e] = KC_2, - [0x26] = KC_3, - [0x25] = KC_4, - [0x2e] = KC_5, - [0x36] = KC_6, - [0x3d] = KC_7, - [0x3e] = KC_8, - [0x46] = KC_9, - [0x45] = KC_0, - - [0x4e] = KC_MINUS, - [0x55] = KC_EQUALS, - [0x66] = KC_BACKSPACE, - - [0x0d] = KC_TAB, - - [0x15] = KC_Q, - [0x1d] = KC_W, - [0x24] = KC_E, - [0x2d] = KC_R, - [0x2c] = KC_T, - [0x35] = KC_Y, - [0x3c] = KC_U, - [0x43] = KC_I, - [0x44] = KC_O, - [0x4d] = KC_P, - - [0x54] = KC_LBRACKET, - [0x5b] = KC_RBRACKET, - - [0x58] = KC_CAPS_LOCK, - - [0x1c] = KC_A, - [0x1b] = KC_S, - [0x23] = KC_D, - [0x2b] = KC_F, - [0x34] = KC_G, - [0x33] = KC_H, - [0x3b] = KC_J, - [0x42] = KC_K, - [0x4b] = KC_L, - - [0x4c] = KC_SEMICOLON, - [0x52] = KC_QUOTE, - [0x5d] = KC_BACKSLASH, - - [0x12] = KC_LSHIFT, - - [0x1a] = KC_Z, - [0x22] = KC_X, - [0x21] = KC_C, - [0x2a] = KC_V, - [0x32] = KC_B, - [0x31] = KC_N, - [0x3a] = KC_M, - - [0x41] = KC_COMMA, - [0x49] = KC_PERIOD, - [0x4a] = KC_SLASH, - - [0x59] = KC_RSHIFT, - - [0x14] = KC_LCTRL, - [0x11] = KC_LALT, - [0x29] = KC_SPACE, - - [0x76] = KC_ESCAPE, - - [0x05] = KC_F1, - [0x06] = KC_F2, - [0x04] = KC_F3, - [0x0c] = KC_F4, - [0x03] = KC_F5, - [0x0b] = KC_F6, - [0x02] = KC_F7, - - [0x0a] = KC_F8, - [0x01] = KC_F9, - [0x09] = KC_F10, - - [0x78] = KC_F11, - [0x07] = KC_F12, - - [0x60] = KC_SCROLL_LOCK, - - [0x5a] = KC_ENTER, - - [0x77] = KC_NUM_LOCK, - [0x7c] = KC_NTIMES, - [0x7b] = KC_NMINUS, - [0x79] = KC_NPLUS, - [0x6c] = KC_N7, - [0x75] = KC_N8, - [0x7d] = KC_N9, - [0x6b] = KC_N4, - [0x73] = KC_N5, - [0x74] = KC_N6, - [0x69] = KC_N1, - [0x72] = KC_N2, - [0x7a] = KC_N3, - [0x70] = KC_N0, - [0x71] = KC_NPERIOD -}; - -static int scanmap_e0[] = { - [0x65] = KC_RALT, - [0x59] = KC_RSHIFT, - - [0x64] = KC_PRTSCR, - - [0x70] = KC_INSERT, - [0x6c] = KC_HOME, - [0x7d] = KC_PAGE_UP, - - [0x71] = KC_DELETE, - [0x69] = KC_END, - [0x7a] = KC_PAGE_DOWN, - - [0x75] = KC_UP, - [0x6b] = KC_LEFT, - [0x72] = KC_DOWN, - [0x74] = KC_RIGHT, - - [0x4a] = KC_NSLASH, - [0x5a] = KC_NENTER -}; - -int kbd_ctl_init(void) -{ - ds = ds_s; - return 0; -} - -void kbd_ctl_parse_scancode(int scancode) -{ - static int key_release_flag = 0; - static int is_locked = 0; - console_ev_type_t type; - unsigned int key; - int *map; - size_t map_length; - - if (scancode == 0xe0) { - ds = ds_e; - return; - } - - switch (ds) { - case ds_s: - map = scanmap_simple; - map_length = sizeof(scanmap_simple) / sizeof(int); - break; - case ds_e: - map = scanmap_e0; - map_length = sizeof(scanmap_e0) / sizeof(int); - break; - default: - map = NULL; - map_length = 0; - } - - ds = ds_s; - if (scancode == 0xf0) { - key_release_flag = 1; - return; - } else { - if (key_release_flag) { - type = KEY_RELEASE; - key_release_flag = 0; - if (is_lock_key(scancode)) { - if (!is_locked) { - is_locked = 1; - } else { - is_locked = 0; - return; - } - } - } else { - if (is_lock_key(scancode) && is_locked) - return; - type = KEY_PRESS; - } - } - - if (scancode < 0) - return; - - key = map[scancode]; - if (key != 0) - kbd_push_ev(type, key); -} - -static bool is_lock_key(int sc) -{ - return ((sc == PL050_CAPS_SCAN_CODE) || (sc == PL050_NUM_SCAN_CODE) || - (sc == PL050_SCROLL_SCAN_CODE)); -} - -void kbd_ctl_set_ind(unsigned mods) -{ - (void) mods; -} - -/** - * @} - */ Index: uspace/srv/hid/kbd/generic/kbd.c =================================================================== --- uspace/srv/hid/kbd/generic/kbd.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hid/kbd/generic/kbd.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -67,6 +67,6 @@ static unsigned lock_keys; -int cir_service = 0; -int cir_phone = -1; +bool irc_service = false; +int irc_phone = -1; #define NUM_LAYOUTS 3 @@ -216,12 +216,11 @@ sysarg_t obio; - if ((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc)) - cir_service = SERVICE_FHC; - else if ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio)) - cir_service = SERVICE_OBIO; - - if (cir_service) { - while (cir_phone < 0) - cir_phone = service_connect_blocking(cir_service, 0, 0); + if (((sysinfo_get_value("kbd.cir.fhc", &fhc) == EOK) && (fhc)) + || ((sysinfo_get_value("kbd.cir.obio", &obio) == EOK) && (obio))) + irc_service = true; + + if (irc_service) { + while (irc_phone < 0) + irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0); } Index: uspace/srv/hid/kbd/include/kbd.h =================================================================== --- uspace/srv/hid/kbd/include/kbd.h (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hid/kbd/include/kbd.h (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -38,6 +38,8 @@ #define KBD_KBD_H_ -extern int cir_service; -extern int cir_phone; +#include + +extern bool irc_service; +extern int irc_phone; extern void kbd_push_scancode(int); Index: uspace/srv/hid/kbd/port/ns16550.c =================================================================== --- uspace/srv/hid/kbd/port/ns16550.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hid/kbd/port/ns16550.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -120,6 +120,6 @@ kbd_push_scancode(scan_code); - if (cir_service) - async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT, + if (irc_service) + async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, IPC_GET_IMETHOD(*call)); } Index: uspace/srv/hid/kbd/port/z8530.c =================================================================== --- uspace/srv/hid/kbd/port/z8530.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hid/kbd/port/z8530.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -108,6 +108,6 @@ kbd_push_scancode(scan_code); - if (cir_service) - async_msg_1(cir_phone, IRC_CLEAR_INTERRUPT, + if (irc_service) + async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT, IPC_GET_IMETHOD(*call)); } Index: uspace/srv/hw/irc/apic/apic.c =================================================================== --- uspace/srv/hw/irc/apic/apic.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hw/irc/apic/apic.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -107,5 +107,5 @@ async_set_client_connection(apic_connection); - service_register(SERVICE_APIC); + service_register(SERVICE_IRC); return true; Index: uspace/srv/hw/irc/fhc/fhc.c =================================================================== --- uspace/srv/hw/irc/fhc/fhc.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hw/irc/fhc/fhc.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -136,5 +136,5 @@ async_set_client_connection(fhc_connection); - service_register(SERVICE_FHC); + service_register(SERVICE_IRC); return true; Index: uspace/srv/hw/irc/i8259/i8259.c =================================================================== --- uspace/srv/hw/irc/i8259/i8259.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hw/irc/i8259/i8259.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -149,5 +149,5 @@ async_set_client_connection(i8259_connection); - service_register(SERVICE_I8259); + service_register(SERVICE_IRC); return true; Index: uspace/srv/hw/irc/obio/obio.c =================================================================== --- uspace/srv/hw/irc/obio/obio.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hw/irc/obio/obio.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -137,5 +137,5 @@ async_set_client_connection(obio_connection); - service_register(SERVICE_OBIO); + service_register(SERVICE_IRC); return true; Index: uspace/srv/hw/netif/ne2000/ne2000.c =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/hw/netif/ne2000/ne2000.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -75,5 +75,5 @@ #define IRQ_GET_TSR(call) ((int) IPC_GET_ARG3(call)) -static int irc_service = 0; +static bool irc_service = false; static int irc_phone = -1; @@ -383,12 +383,11 @@ sysarg_t i8259; - if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) - irc_service = SERVICE_APIC; - else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)) - irc_service = SERVICE_I8259; + if (((sysinfo_get_value("apic", &apic) == EOK) && (apic)) + || ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259))) + irc_service = true; if (irc_service) { while (irc_phone < 0) - irc_phone = service_connect_blocking(irc_service, 0, 0); + irc_phone = service_connect_blocking(SERVICE_IRC, 0, 0); } Index: uspace/srv/net/il/arp/arp.c =================================================================== --- uspace/srv/net/il/arp/arp.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/net/il/arp/arp.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -157,9 +157,9 @@ arp_clear_addr(&proto->addresses); - arp_addr_destroy(&proto->addresses); - } - } - - arp_protos_clear(&device->protos); + arp_addr_destroy(&proto->addresses, free); + } + } + + arp_protos_clear(&device->protos, free); } @@ -184,5 +184,5 @@ } - arp_cache_clear(&arp_globals.cache); + arp_cache_clear(&arp_globals.cache, free); fibril_mutex_unlock(&arp_globals.lock); @@ -212,5 +212,5 @@ arp_clear_trans(trans); - arp_addr_exclude(&proto->addresses, address->value, address->length); + arp_addr_exclude(&proto->addresses, address->value, address->length, free); fibril_mutex_unlock(&arp_globals.lock); @@ -345,5 +345,5 @@ header->protocol_length, trans); if (rc != EOK) { - /* The generic char map has already freed trans! */ + free(trans); return rc; } @@ -556,5 +556,5 @@ if (index < 0) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return index; @@ -569,5 +569,5 @@ if (device->phone < 0) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return EREFUSED; @@ -579,5 +579,5 @@ if (rc != EOK) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -589,5 +589,5 @@ if (rc != EOK) { fibril_mutex_unlock(&arp_globals.lock); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -601,5 +601,5 @@ free(device->addr); free(device->addr_data); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -614,5 +614,5 @@ free(device->broadcast_addr); free(device->broadcast_data); - arp_protos_destroy(&device->protos); + arp_protos_destroy(&device->protos, free); free(device); return rc; @@ -746,5 +746,5 @@ arp_clear_trans(trans); arp_addr_exclude(&proto->addresses, target->value, - target->length); + target->length, free); return EAGAIN; } @@ -794,5 +794,5 @@ trans); if (rc != EOK) { - /* The generic char map has already freed trans! */ + free(trans); return rc; } @@ -807,5 +807,5 @@ arp_clear_trans(trans); arp_addr_exclude(&proto->addresses, target->value, - target->length); + target->length, free); return ENOENT; } Index: uspace/srv/net/il/ip/ip.c =================================================================== --- uspace/srv/net/il/ip/ip.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/net/il/ip/ip.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -505,5 +505,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&ip_globals.netifs_lock); - ip_routes_destroy(&ip_netif->routes); + ip_routes_destroy(&ip_netif->routes, free); free(ip_netif); return rc; Index: uspace/srv/net/net/net.c =================================================================== --- uspace/srv/net/net/net.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/net/net/net.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -289,12 +289,15 @@ if (rc != EOK) return rc; + rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME, (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service); if (rc != EOK) return rc; + rc = add_module(NULL, &net_globals.modules, (uint8_t *) ETHERNET_NAME, (uint8_t *) ETHERNET_FILENAME, SERVICE_ETHERNET, 0, connect_to_service); if (rc != EOK) return rc; + rc = add_module(NULL, &net_globals.modules, (uint8_t *) NILDUMMY_NAME, (uint8_t *) NILDUMMY_FILENAME, SERVICE_NILDUMMY, 0, connect_to_service); @@ -552,5 +555,5 @@ rc = read_netif_configuration(conf_files[i], netif); if (rc != EOK) { - measured_strings_destroy(&netif->configuration); + measured_strings_destroy(&netif->configuration, free); free(netif); return rc; @@ -562,5 +565,5 @@ if (!setting) { fprintf(stderr, "%s: Network interface name is missing\n", NAME); - measured_strings_destroy(&netif->configuration); + measured_strings_destroy(&netif->configuration, free); free(netif); return EINVAL; @@ -571,5 +574,5 @@ int index = netifs_add(&net_globals.netifs, netif->id, netif); if (index < 0) { - measured_strings_destroy(&netif->configuration); + measured_strings_destroy(&netif->configuration, free); free(netif); return index; @@ -583,6 +586,6 @@ index); if (rc != EOK) { - measured_strings_destroy(&netif->configuration); - netifs_exclude_index(&net_globals.netifs, index); + measured_strings_destroy(&netif->configuration, free); + netifs_exclude_index(&net_globals.netifs, index, free); return rc; } @@ -590,10 +593,9 @@ rc = start_device(netif); if (rc != EOK) { - printf("%s: Error starting interface %s (%s)\n", NAME, + printf("%s: Ignoring failed interface %s (%s)\n", NAME, netif->name, str_error(rc)); - measured_strings_destroy(&netif->configuration); - netifs_exclude_index(&net_globals.netifs, index); - - return rc; + measured_strings_destroy(&netif->configuration, free); + netifs_exclude_index(&net_globals.netifs, index, free); + continue; } Index: uspace/srv/net/nil/eth/eth.c =================================================================== --- uspace/srv/net/nil/eth/eth.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/net/nil/eth/eth.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -214,5 +214,5 @@ if (rc != EOK) { free(eth_globals.broadcast_addr); - eth_devices_destroy(ð_globals.devices); + eth_devices_destroy(ð_globals.devices, free); } out: Index: uspace/srv/net/tl/tcp/tcp.c =================================================================== --- uspace/srv/net/tl/tcp/tcp.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/net/tl/tcp/tcp.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -1707,5 +1707,5 @@ if (socket->port > 0) { socket_ports_exclude(&tcp_globals.sockets, - socket->port); + socket->port, free); socket->port = 0; } @@ -2492,5 +2492,5 @@ rc = packet_dimensions_initialize(&tcp_globals.dimensions); if (rc != EOK) { - socket_ports_destroy(&tcp_globals.sockets); + socket_ports_destroy(&tcp_globals.sockets, free); goto out; } Index: uspace/srv/net/tl/udp/udp.c =================================================================== --- uspace/srv/net/tl/udp/udp.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/net/tl/udp/udp.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -417,5 +417,5 @@ rc = packet_dimensions_initialize(&udp_globals.dimensions); if (rc != EOK) { - socket_ports_destroy(&udp_globals.sockets); + socket_ports_destroy(&udp_globals.sockets, free); fibril_rwlock_write_unlock(&udp_globals.lock); return rc; @@ -434,5 +434,5 @@ &data); if (rc != EOK) { - socket_ports_destroy(&udp_globals.sockets); + socket_ports_destroy(&udp_globals.sockets, free); fibril_rwlock_write_unlock(&udp_globals.lock); return rc; @@ -740,5 +740,5 @@ int socket_id; size_t addrlen; - size_t size; + size_t size = 0; ipc_call_t answer; size_t answer_count; Index: uspace/srv/vfs/vfs_ops.c =================================================================== --- uspace/srv/vfs/vfs_ops.c (revision 2cf95e8c9cec32a4eeae9cef57c658d69f9209a9) +++ uspace/srv/vfs/vfs_ops.c (revision 3317724ade03c3602e2ba1e125180ec5fe566732) @@ -1234,4 +1234,5 @@ if (!parentc) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, rc); free(old); @@ -1251,4 +1252,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, rc); free(old); @@ -1261,4 +1263,5 @@ (old_node->devmap_handle != new_par_lr.triplet.devmap_handle)) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, EXDEV); /* different file systems */ free(old); @@ -1279,4 +1282,5 @@ if (!new_node) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, ENOMEM); free(old); @@ -1290,4 +1294,5 @@ default: fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); async_answer_0(rid, ENOTEMPTY); free(old); @@ -1300,4 +1305,5 @@ if (rc != EOK) { fibril_rwlock_write_unlock(&namespace_rwlock); + vfs_node_put(old_node); if (new_node) vfs_node_put(new_node);