linux-user: fix undefined shift in copy_to_user_fdset
PATCH 1/1 linux-user: fix undefined shift in copy_to_user_fdset
If TARGET_ABI_BITS is bigger than 32 we shift by more than the size of int.
Signed-off-by Andreas Schwab <[email protected]>
--- linux-user/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
linux-user/syscall.c +1 -1
@@ -922,7 +922,7 @@ static inline abi_long copy_to_user_fdset(abi_ulong target_fds_addr,for (i =0 ; i < nw; i++) { v =0 ;for (j =0 ; j <TARGET_ABI_BITS ; j++) { - v |= ((FD_ISSET (k, fds) !=0 ) << j); + v |= ((abi_ulong)(FD_ISSET (k, fds) !=0 ) << j); k++; }__put_user (v, &target_fds[i]);
Signature · 6 lines
1.8.2.1 -- Andreas Schwab, SUSE Labs, [email protected] GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
Quoted 3 lines · Andreas Schwab
If
TARGET_ABI_BITSis bigger than 32 we shift by more than the size of int.Signed-off-by Andreas Schwab <[email protected]>
Reviewed-by Peter Maydell <[email protected]>
-- PMM
Quoted 25 lines
--- linux-user/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)linux-user/syscall.c +1
-2@@ -922,7 +922,7 @@ static inline abi_long copy_to_user_fdset(abi_ulong target_fds_addr,for (i =0 ; i < nw; i++) { v =0 ;for (j =0 ; j <TARGET_ABI_BITS ; j++) { - v |= ((FD_ISSET (k, fds) !=0 ) << j); + v |= ((abi_ulong)(FD_ISSET (k, fds) !=0 ) << j); k++; }__put_user (v, &target_fds[i]); --1.8.2.1
--
Andreas Schwab, SUSE Labs, [email protected]
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."