From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756156AbcAZGd4 (ORCPT ); Tue, 26 Jan 2016 01:33:56 -0500 Received: from mail-db3on0084.outbound.protection.outlook.com ([157.55.234.84]:52160 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754436AbcAZGdv (ORCPT ); Tue, 26 Jan 2016 01:33:51 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=mika.penttila@nextfour.com; From: To: CC: , , =?UTF-8?q?Mika=20Penttil=C3=A4?= Subject: [PATCH 2/2 v2] make apply_to_page_range() more robust. Date: Tue, 26 Jan 2016 08:33:09 +0200 Message-ID: <1453789989-13260-3-git-send-email-mika.penttila@nextfour.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453789989-13260-1-git-send-email-mika.penttila@nextfour.com> References: <1453789989-13260-1-git-send-email-mika.penttila@nextfour.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [194.157.170.34] X-ClientProxiedBy: AM3PR07CA0046.eurprd07.prod.outlook.com (10.141.45.174) To DB5PR07MB0903.eurprd07.prod.outlook.com (25.161.196.19) X-Microsoft-Exchange-Diagnostics: 1;DB5PR07MB0903;2:WUApwUSiYK9uhnjY7eljgVBxP0WX0BHz0QkMqINgiUlOHkWYycqqvLk033y5Mo9yjzT85jpsKpm5pUui94MzM6lTew0BKI+rKa96N085LZQAmHmKoXYWIYNZvenYdiMkL9E3Eot5RuBMF+ZeqtUYKw==;3:zkzmnSlNYtUuyXI0uwEUQO7sKA0v8SKKxN6du4+8ZjQPBBj1VeMDpWYY9KN3nLODOX+9qnNZdBD27wY9UOUKeVlJVL5sGvEPhgSp16RaLQ7jj0hDeQp9E/9TRZJhITeP;25:O+sZIe9Lj7US8dnR6qbOW1JSfbFGSvE0fbm+DaAW2KCRT6DpcRTnV1FN2g0aNMw8xyXAA/ANUQPb/EpWC+z/CnxyQ5XGl7dW5cGVQGghWvqTiGkzVCumfbhXjRijd7NYOq64TVQ2x44JebWVndIQ/bSMY8gdDe09K8o2AfAacoEb5eNnltcAisxu1duPx9tgsJEFpeyn24yxPbddXZqbws4dwo8KQfKAOPRJRu8mhnF+IegJZdijjQhvKQUnwVhD;4:2AUfJu+jZZ0ZVh8fa1X1+bxi8Gu/MkRGzPpWEJJo7qFBvs8mNYDSsUgASBNEnlUS8jOL0/ajbXrxA24McO2gvIw1hmGkRWIULQSDCli5ucJGv3vrPA3yLkZnZZWNk8sbSEC5SzMKZ08Tu2u7FaxFjVUTilGcdgN4sEUe6sDLoZ08SdbSi12PuL0y4wfhzXz7f8pW0pCYjJ8Rf6ehc2aqbd74ZkufOdVLDduysq0ycrHxtD4SDpnb1OFA3tR9hPSIu/21yMqQo8nECm8FA1b79T6CAVYSShJeoB0/lQHXlwO2GrKxTJHIyCHSlcYkwt6R5FQOyszjcQo5V9yBE6eHq7j0tAWwXfq/FkzsTLADwuMglmcsKRwJ8fcujHJVSzJVJReoe1eLoP+z2y+uEL4Eog== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB5PR07MB0903; X-MS-Office365-Filtering-Correlation-Id: 72cd8c1d-4f8d-4696-cbfb-08d3261aa6a2 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(123027)(601004)(2401047)(8121501046)(5005006)(520078)(3002001)(10201501046);SRVR:DB5PR07MB0903;BCL:0;PCL:0;RULEID:;SRVR:DB5PR07MB0903; X-Forefront-PRVS: 08331F819E X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(189002)(199003)(4326007)(2876002)(86152002)(53416004)(122386002)(2906002)(50466002)(42186005)(19580405001)(86362001)(23676002)(92566002)(69596002)(40100003)(33646002)(36756003)(87976001)(2870700001)(5820100001)(5004730100002)(50226001)(110136002)(77096005)(1096002)(2351001)(107886002)(229853001)(5001960100002)(2950100001)(3846002)(4001430100002)(66066001)(81156007)(19580395003)(101416001)(5008740100001)(6116002)(76176999)(97736004)(47776003)(106356001)(105586002)(50986999)(586003)(189998001);DIR:OUT;SFP:1101;SCL:1;SRVR:DB5PR07MB0903;H:mjp-ThinkCentre-M92p.nextfour.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjVQUjA3TUIwOTAzOzIzOk5kMVJLemhhQ0ppOGhGeFo1emd0K1lLMjhj?= =?utf-8?B?bGhkLzROUDJEQXptSHR5a2tFem82NDhUM0Y2M3AwSUUrOGV6Q2RkWXZmbzN3?= =?utf-8?B?cDlUTWtjREduc3JRQUVMNTRjTHJURlk4bHlRMzVLWXFMelVXUlJWdllJQmZM?= =?utf-8?B?clRsT1BDbzRnZWIvS2FmeTZ5N3JkekRCSW1HWE9QK2gyTDk1amNNdFg3Z2xN?= =?utf-8?B?eXBnTEJ0NlZQdXdPRzFxS3pNSk82dER5S1hMcWM4dG53VDVCVmh4eDA2NGVl?= =?utf-8?B?Vm8wTmFJbSs0bDQ2eitGeS9aQkF3Tk1lTUtXQTRtUXpGVkdoNzY4Q2dXVWNn?= =?utf-8?B?TUZ0QmtRMzlST3hUMy96UTFBeWlBbkU1Wm5lNGx2QWZ4SWVXMHE0VTJ3RDNs?= =?utf-8?B?eS94Rmt1SWJYZitMeW8yRDIrNkMrMEJaWmllYWl0Y01LcHkwZDR0Qmx2NjBp?= =?utf-8?B?N3d2MTY3aWJzdWVIT2dtNXBveGVjUnZSeU0yK2doY1RnNEFkUEJDY09Ddkp0?= =?utf-8?B?OVFNam51OUVkL21QZ3lyYXlEVTFxbUVqTEQrbHVaUTFBSm04N0NNMHFXY1Ji?= =?utf-8?B?aHpIL3FVempDanBhdG84R3BqVE5FaUVtSlUwOWpWNDdRLy9JSExBRnRtYUgz?= =?utf-8?B?OEozaGd6OU9EYU5lem9WWmZ5cUZheWxMaDZ4QTJmYVpFODBaYnNFbThjQWpy?= =?utf-8?B?SllIOEp5SS9uc1RRblNJdDZseVVHL2s0U3F0czNQQlFPV25LUm5JVnlKZXBW?= =?utf-8?B?aEtWa0NXa2VUZ255QVhwOHNqUWYyMzlteko0ZXduVkJtdzAveUFpenR3Z1FS?= =?utf-8?B?UDZ6NUxoc1VIWG9XZytGNlBySnlxK2RhbGFoU3podTQ4YmcybHFpU2JUOWY4?= =?utf-8?B?YkkwUkhlTHl6Vm9xa01acEVSN3p4OE9VREVMMVBuenk5YXNtdmlxbFdrME5k?= =?utf-8?B?OTNWbXlxYXRZZDVPNHZSa1JBSXIzSWFYQVc5VHRWQkRaRmhkazl6YkxlV2I4?= =?utf-8?B?ZFZyaUFnYVR2TGxIYU54ZGdISUIzZnNPVSs2ek9LME5WL1VGaUtXSThkbE5h?= =?utf-8?B?RlRYaVM5Uk9wcUZZV0UydEZPUEc0WGtiNXR6ZVV6aUkxV1l6OTB4R0tPWE0w?= =?utf-8?B?RnVwZTMxTjJOZldxTVBHakw3WFNsQWg4RnF0Q3dGL2VBeWM4UTRKNzFjZEFh?= =?utf-8?B?Z2VCUnNXaUZkWXZoVzZYdE1qek50VlRPbWYxZDFxZW9vQXhtNUVQeGJEdWxM?= =?utf-8?B?WkMyRFpCWkRMMmpRVEtmU1B3cTJKODFyczc3eWxwNTVKZ1dNYXhnZTlxME5U?= =?utf-8?B?WEhKU0FydURHbThreTBEazUzR0kzRy9ZWE11SWxDTXBoYVNZOWhwMmJvMjBR?= =?utf-8?B?Q3Q3ZjRqQzQybFNEUytrTTNzanJTQ085TmwyTVNmUTZlK0plZSthU2NsaWwr?= =?utf-8?B?MmRRZVFEVXBRalo4SyswVFlBakN0b2NUZnZCN00zV0crdDY2NGR5ZDJzSkpq?= =?utf-8?B?UElvbDFBUjgxT3BEWWxDdkRvS2hMd20xdk5malhId2VvOG85cHZKcjNBa3JI?= =?utf-8?B?NkoxWkZGc0tJWFFYSGwzQVVqbXo0azBHY2U4UFlmMWpQcTl5bUwvUktac09h?= =?utf-8?B?eFQzalk2d3hCU2RVSWVzSXQyQjJTdUt4c0tyTE5HOUNJeEJpdUU2VmlRPT0=?= X-Microsoft-Exchange-Diagnostics: 1;DB5PR07MB0903;5:qhDPhciK1wedfZC0OcLeO8fhTDCYOyLJMYmwjtUhPn+q116dynOyQTh5256Z9NQbCuv4c535WIkb+vL/cL8OeALIUwnENEbbkjwgQigv63mSJJBGhobu9PUrodmMjFC/pvkrBBsDaaD296ik/5B9Iw==;24:lHmSJjqQMSjxX3uCe9ld5qCk8kNIbPHbfNPbSdBoQHHZrxmb/UZOUni+tL1Go4SGctvQTXoHSniFNvkYPnaDm6RDocTGi/CJMZbOjXGSzKM= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nextfour.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2016 06:33:49.2938 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR07MB0903 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mika Penttilä Now the arm/arm64 don't trigger this BUG_ON() any more, but WARN_ON() is here enough to catch buggy callers but still let potential other !size callers pass with warning. Signed-off-by: Mika Penttilä mika.penttila@nextfour.com Reviewed-by: Pekka Enberg Acked-by: David Rientjes --- mm/memory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/memory.c b/mm/memory.c index 30991f8..9178ee6 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1871,7 +1871,9 @@ int apply_to_page_range(struct mm_struct *mm, unsigned long addr, unsigned long end = addr + size; int err; - BUG_ON(addr >= end); + if (WARN_ON(addr >= end)) + return -EINVAL; + pgd = pgd_offset(mm, addr); do { next = pgd_addr_end(addr, end); -- 1.9.1