From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2651967-1524406939-2-5529250456352964942 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1524406939; b=CyerExKpyKZX9eYMfX2A++15ptTrF33a4kznM43XutaB1d1dYo Z72MkTqR+5tVMAqWPTkh8nW4sVt+6VLgjNVS4mjilnTelhw1qAyKxZgbArNOET71 mN6IfL6Gs2NjVa1vxSnmz4acyBs993Wb/OMrYu13114XFW987iADjYlyPFbd1lAW QnEN/h4LV56w6ByH/oq2nWlpI1j1EVXTZQSUlGQ5NsqBwFeczJqukFrDi4z4yOFR 3jpVq9IkCTHbFm/j/PVGfbCJcPlQGy2Qm3eW9b9364frAj2z0Z2cqlF4Ckv5thDG aGXW5hrzWwhli7liB38hthSCpQwumkv9BAOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1524406939; bh=2q/zCY2CJzW1xz8uIF2XocB/t51PC4 FhL+XAD0IYxaU=; b=kyK3yDhIO9rg42gx0Sy82JC52VQgBWaj77KYdL5DhrpFrI B+LjvsUercHNPlVsX3YpytMWL1irEEXe0xloMeLKrK3fUpSRCuIWBiXFSFwrc/gX Jwd/X7OaTxTfcH9//N3WAHcdiEUi0KzJqgg+qd9PYXLeoexV+ciDV7wkBq6oG1QA lgEsfgQofrMEv+b5nZAnC7sAsotO6606m6Jwq/cMKhI6I4RJdRTOWkQ+bIAl5424 T0AQjGH3lPoWW7UzIXl18G8fAqzgbR2BZbj1n0QG8UAb65yb0/lQYbOYCRBCbVK/ mFvgqEMW4R5CfyEHQ1j68ONAZoWi+Du595w/Y7Fg== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfLfMdsx7KqXROofM6kXxPjh19c8kDnaEbdi6CvML4MG0GJQxByYnBjGugnI/DBggo4RrcaDovoCBZncCPuI8egXlfYUpoaCKGfN5aUDS+VcCSMBMHdYU 6kFPIxad8XpZdryjqgZ1Vf0H/Un8/cU0gaSSc6CcLmWBjKaUriSsVve/JlVx3WDJSrZ8AJ1gvfnPazfbCbxh4VnpMjTGDV5cH3UF9g2E/pHC1U5YxFbueisz X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=BTeA3XvPAAAA:8 a=VwQbUJbxAAAA:8 a=ag1SF4gXAAAA:8 a=HQYL0dNX9r2gA2wembEA:9 a=QEXdDO2ut3YA:10 a=tafbbOV3vt1XuEhzTjGK:22 a=AjGcO6oz07-iQ99wixmX:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757701AbeDVOWP (ORCPT ); Sun, 22 Apr 2018 10:22:15 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:33262 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757300AbeDVOWH (ORCPT ); Sun, 22 Apr 2018 10:22:07 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Theodore Tso , Chen Feng Subject: [PATCH 3.18 24/52] random: use a tighter cap in credit_entropy_bits_safe() Date: Sun, 22 Apr 2018 15:53:57 +0200 Message-Id: <20180422135316.507807049@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422135315.254787616@linuxfoundation.org> References: <20180422135315.254787616@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Theodore Ts'o commit 9f886f4d1d292442b2f22a0a33321eae821bde40 upstream. This fixes a harmless UBSAN where root could potentially end up causing an overflow while bumping the entropy_total field (which is ignored once the entropy pool has been initialized, and this generally is completed during the boot sequence). This is marginal for the stable kernel series, but it's a really trivial patch, and it fixes UBSAN warning that might cause security folks to get overly excited for no reason. Signed-off-by: Theodore Ts'o Reported-by: Chen Feng Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/char/random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -704,7 +704,7 @@ retry: static void credit_entropy_bits_safe(struct entropy_store *r, int nbits) { - const int nbits_max = (int)(~0U >> (ENTROPY_SHIFT + 1)); + const int nbits_max = r->poolinfo->poolwords * 32; /* Cap the value to avoid overflows */ nbits = min(nbits, nbits_max);