forked from rpms/kernel
		
	Linux v4.9-rc2-40-g9fe68ca
This commit is contained in:
		
							parent
							
								
									5ddb8c76cb
								
							
						
					
					
						commit
						a5179f37fc
					
				
							
								
								
									
										2
									
								
								gitrev
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gitrev
									
									
									
									
									
								
							| @ -1 +1 @@ | |||||||
| 6edc51a8d43b0bb8263fefaa8eb0cf62e8499978 | 9fe68cad6e74967b88d0c6aeca7d9cd6b6e91942 | ||||||
|  | |||||||
							
								
								
									
										10
									
								
								kernel.spec
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								kernel.spec
									
									
									
									
									
								
							| @ -42,7 +42,7 @@ Summary: The Linux kernel | |||||||
| # For non-released -rc kernels, this will be appended after the rcX and | # For non-released -rc kernels, this will be appended after the rcX and | ||||||
| # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" | # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" | ||||||
| # | # | ||||||
| %global baserelease 2 | %global baserelease 1 | ||||||
| %global fedora_build %{baserelease} | %global fedora_build %{baserelease} | ||||||
| 
 | 
 | ||||||
| # base_sublevel is the kernel version we're starting with and patching | # base_sublevel is the kernel version we're starting with and patching | ||||||
| @ -69,7 +69,7 @@ Summary: The Linux kernel | |||||||
| # The rc snapshot level | # The rc snapshot level | ||||||
| %global rcrev 2 | %global rcrev 2 | ||||||
| # The git snapshot level | # The git snapshot level | ||||||
| %define gitrev 0 | %define gitrev 1 | ||||||
| # Set rpm version accordingly | # Set rpm version accordingly | ||||||
| %define rpmversion 4.%{upstream_sublevel}.0 | %define rpmversion 4.%{upstream_sublevel}.0 | ||||||
| %endif | %endif | ||||||
| @ -606,9 +606,6 @@ Patch848: 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch | |||||||
| #ongoing complaint, full discussion delayed until ksummit/plumbers | #ongoing complaint, full discussion delayed until ksummit/plumbers | ||||||
| Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch | Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch | ||||||
| 
 | 
 | ||||||
| #rhbz 1383451 |  | ||||||
| Patch850: resend-4.9-hw_random-Don-t-use-a-stack-buffer-in-add_early_randomness.patch |  | ||||||
| 
 |  | ||||||
| # END OF PATCH DEFINITIONS | # END OF PATCH DEFINITIONS | ||||||
| 
 | 
 | ||||||
| %endif | %endif | ||||||
| @ -2147,6 +2144,9 @@ fi | |||||||
| # | # | ||||||
| # | # | ||||||
| %changelog | %changelog | ||||||
|  | * Tue Oct 25 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc2.git1.1 | ||||||
|  | - Linux v4.9-rc2-40-g9fe68ca | ||||||
|  | 
 | ||||||
| * Tue Oct 25 2016 Laura Abbott <labbott@redhat.com> | * Tue Oct 25 2016 Laura Abbott <labbott@redhat.com> | ||||||
| - Reenable debugging options. | - Reenable debugging options. | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -1,56 +0,0 @@ | |||||||
| From patchwork Mon Oct 17 17:06:27 2016 |  | ||||||
| Content-Type: text/plain; charset="utf-8" |  | ||||||
| MIME-Version: 1.0 |  | ||||||
| Content-Transfer-Encoding: 7bit |  | ||||||
| Subject: [resend, |  | ||||||
|  4.9] hw_random: Don't use a stack buffer in add_early_randomness() |  | ||||||
| From: Andrew Lutomirski <luto@kernel.org> |  | ||||||
| X-Patchwork-Id: 9380037 |  | ||||||
| Message-Id: <4169224b6858d1cf149f1a73f8a03603fa19076d.1476638125.git.luto@kernel.org> |  | ||||||
| To: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, |  | ||||||
|  Matt Mackall <mpm@selenic.com>, Herbert Xu <herbert@gondor.apana.org.au>, |  | ||||||
|  Rusty Russell <rusty@rustcorp.com.au> |  | ||||||
| Cc: Jens Axboe <axboe@fb.com>, Matt Mullins <mmullins@mmlx.us>, |  | ||||||
|  Andy Lutomirski <luto@kernel.org> |  | ||||||
| Date: Mon, 17 Oct 2016 10:06:27 -0700 |  | ||||||
| 
 |  | ||||||
| hw_random carefully avoids using a stack buffer except in |  | ||||||
| add_early_randomness().  This causes a crash in virtio_rng if |  | ||||||
| CONFIG_VMAP_STACK=y. |  | ||||||
| 
 |  | ||||||
| Reported-by: Matt Mullins <mmullins@mmlx.us> |  | ||||||
| Tested-by: Matt Mullins <mmullins@mmlx.us> |  | ||||||
| Fixes: d3cc7996473a ("hwrng: fetch randomness only after device init") |  | ||||||
| Signed-off-by: Andy Lutomirski <luto@kernel.org> |  | ||||||
| ---
 |  | ||||||
| 
 |  | ||||||
| This fixes a crash in 4.9-rc1. |  | ||||||
| 
 |  | ||||||
| resending because I typoed the git send-email command.  I stealthily added |  | ||||||
| Matt's Tested-by, too. |  | ||||||
| 
 |  | ||||||
|  drivers/char/hw_random/core.c | 6 +++--- |  | ||||||
|  1 file changed, 3 insertions(+), 3 deletions(-) |  | ||||||
| 
 |  | ||||||
| diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
 |  | ||||||
| index 9203f2d130c0..340f96e44642 100644
 |  | ||||||
| --- a/drivers/char/hw_random/core.c
 |  | ||||||
| +++ b/drivers/char/hw_random/core.c
 |  | ||||||
| @@ -84,14 +84,14 @@ static size_t rng_buffer_size(void)
 |  | ||||||
|   |  | ||||||
|  static void add_early_randomness(struct hwrng *rng) |  | ||||||
|  { |  | ||||||
| -	unsigned char bytes[16];
 |  | ||||||
|  	int bytes_read; |  | ||||||
| +	size_t size = min_t(size_t, 16, rng_buffer_size());
 |  | ||||||
|   |  | ||||||
|  	mutex_lock(&reading_mutex); |  | ||||||
| -	bytes_read = rng_get_data(rng, bytes, sizeof(bytes), 1);
 |  | ||||||
| +	bytes_read = rng_get_data(rng, rng_buffer, size, 1);
 |  | ||||||
|  	mutex_unlock(&reading_mutex); |  | ||||||
|  	if (bytes_read > 0) |  | ||||||
| -		add_device_randomness(bytes, bytes_read);
 |  | ||||||
| +		add_device_randomness(rng_buffer, bytes_read);
 |  | ||||||
|  } |  | ||||||
|   |  | ||||||
|  static inline void cleanup_rng(struct kref *kref) |  | ||||||
							
								
								
									
										1
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								sources
									
									
									
									
									
								
							| @ -1,3 +1,4 @@ | |||||||
| c1af0afbd3df35c1ccdc7a5118cd2d07  linux-4.8.tar.xz | c1af0afbd3df35c1ccdc7a5118cd2d07  linux-4.8.tar.xz | ||||||
| 0dad03f586e835d538d3e0d2cbdb9a28  perf-man-4.8.tar.gz | 0dad03f586e835d538d3e0d2cbdb9a28  perf-man-4.8.tar.gz | ||||||
| ad6f2f144892a36b6d91cbe63c7e042d  patch-4.9-rc2.xz | ad6f2f144892a36b6d91cbe63c7e042d  patch-4.9-rc2.xz | ||||||
|  | e354bf4a3f421fcef9d4513e508a7ce4  patch-4.9-rc2-git1.xz | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user