• D
    9p: local: always return -1 on error in local_unlinkat_common · 846cf408
    Daniel Henrique Barboza 提交于
    local_unlinkat_common() is supposed to always return -1 on error.
    This is being done by jumps to the 'err_out' label, which is
    a 'return ret' call, and 'ret' is initialized with -1.
    
    Unfortunately there is a condition in which the function will
    return 0 on error: in a case where flags == AT_REMOVEDIR, 'ret'
    will be 0 when reaching
    
    map_dirfd = openat_dir(...)
    
    And, if map_dirfd == -1 and errno != ENOENT, the existing 'err_out'
    jump will execute 'return ret', when ret is still set to zero
    at that point.
    
    This patch fixes it by changing all 'err_out' labels by
    'return -1' calls, ensuring that the function will always
    return -1 on error conditions. 'ret' can be left unintialized
    since it's now being used just to store the result of 'unlinkat'
    calls.
    
    CC: Greg Kurz <groug@kaod.org>
    Signed-off-by: NDaniel Henrique Barboza <danielhb413@gmail.com>
    [groug: changed prefix in title to be "9p: local:"]
    Signed-off-by: NGreg Kurz <groug@kaod.org>
    846cf408
9p-local.c 42.7 KB