Commit 1c598ab2 authored Jun 19, 2019 by Lidong Chen Committed by Paolo Bonzini Jun 21, 2019

sd: Fix out-of-bounds assertions



Due to an off-by-one error, the assert statements allow an
out-of-bound array access.  This doesn't happen in practice,
but the static analyzer notices.

Signed-off-by: Lidong Chen <lidong.chen@oracle.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-Id: <6b19cb7359a10a6bedc3ea0fce22fed3ef93c102.1560806687.git.lidong.chen@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 12604092

hw/sd/sd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@ static const char *sd_state_name(enum SDCardStates state)
		if (state == sd_inactive_state) {
		return "inactive";
		}
		assert(state <= ARRAY_SIZE(state_name));
		assert(state < ARRAY_SIZE(state_name));
		return state_name[state];
		}

		@@ -166,7 +166,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp)
		if (rsp == sd_r1b) {
		rsp = sd_r1;
		}
		assert(rsp <= ARRAY_SIZE(response_name));
		assert(rsp < ARRAY_SIZE(response_name));
		return response_name[rsp];
		}