• Andrey Ryabinin's avatar
    lib/idr.c: fix out-of-bounds pointer dereference · 93b7aca3
    Andrey Ryabinin authored
    I'm working on address sanitizer project for kernel.  Recently we
    started experiments with stack instrumentation, to detect out-of-bounds
    read/write bugs on stack.
    
    Just after booting I've hit out-of-bounds read on stack in idr_for_each
    (and in __idr_remove_all as well):
    
    	struct idr_layer **paa = &pa[0];
    
    	while (id >= 0 && id <= max) {
    		...
    		while (n < fls(id)) {
    			n += IDR_BITS;
    			p = *--paa; <--- here we are reading pa[-1] value.
    		}
    	}
    
    Despite the fact that after this dereference we are exiting out of loop
    and never use p, such behaviour is undefined and should be avoided.
    
    Fix this by moving pointer derference to the beggining of the loop,
    right before we will use it.
    Signed-off-by: default avatarAndrey Ryabinin <a.ryabinin@samsung.com>
    Reviewed-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
    Cc: Tejun Heo <tj@kernel.org>
    Cc: Alexey Preobrazhensky <preobr@google.com>
    Cc: Dmitry Vyukov <dvyukov@google.com>
    Cc: Konstantin Khlebnikov <koct9i@gmail.com>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    93b7aca3
idr.c 28 KB