From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3695087-1523236150-2-5578880588710437395 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, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, 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='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' 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= 1523236150; b=qQxmE8mOO26PzHkWf7Y1N7ihUCEqg8axt8cdhPdvI45A+H0QjU lc3oddgaCBZmHghtpbSYUckHsHdJSAIi84kFlLYxguOR69T2u88F01ihPlHJs7YA VNNxTJhXLtE4+PnMV5zLciwwMf50LujgfJc6ohY8CzUrJ912uaErCsTYzlSouox4 L+SAbtxF59B/XVgJ4ggPzj2SO/+fFMH6xIHJ9+O4eAShjCtJZz0gxdA5uwu2YFiu X5sxgGEFWAXitoayAxvinWwqSDNZkpSKa7nILDEStYf6np65g96r4pdMrlwV+p3N Tn+nuEeRnPxDSwQTpMoG2V+lPhShzMM9raig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=fm2; t=1523236150; bh=+LwxDUe/Op /Z598SDF+E4NVe5Vf2iZg6LgBUjRYr7TY=; b=UfPInUOXWbvSJBLKVyNYWUlB4y gDq90o44s7Y/TV4mDTNtp3eEr+DhspuuHBhlTHKzpG/hI0ibJeiSZEmrBtgrE9WJ KGYr2RHJDn3/Rs2xtUJsIq+XHp/JbG4/AWD+oNXHwxlGHr3n2qSmbcjBHtpNAVBu qqO4xAbw7b5BFQniQv0wD8feZjk97QFQYWKBuKghV1DC1rRE/Ui65R1Htj8eIgWo HgKalcc/Yu3fh6dCEnqf/B51OEy5t14W7yrBj2HwPtsmxT6xVNRiZBlKAAyBo8yx 0LcGoJsfA898U0w6AegwL0UEtq6429kpOf37u4TDUxTL8Pp62xM6BxPtSt9g== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=jd8fBJzg x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; 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=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=jd8fBJzg x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; 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=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfCcOFXTA6dIWBgu2C9eH9vACiwypwXT6zFllG9aUHpG0uPXPOnXw9nGI1iXmQJEEkGy8V5iymPGO0RJ5VYUHmzxccw1Ox65VozWBMhoEmFufKZkZYauL XOHxRVfz3UQYDcWHqmPAqeNHRW8agVcDcDa4+xWKtxiBvvOAT79PxVHebkYlsEQzKH/dM51d27ZKowTMnJNPcYPTK9Vhhs+Av/ykf3S36ZvHlzJDkgDfB1RB X-CM-Analysis: v=2.3 cv=WaUilXpX c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=i0EeH86SAAAA:8 a=VwQbUJbxAAAA:8 a=QyXUC8HyAAAA:8 a=NufY4J3AAAAA:8 a=1XWaLZrsAAAA:8 a=nrACCIEEAAAA:8 a=Z4Rwk6OoAAAA:8 a=yMhMjlubAAAA:8 a=yuw3B8Qeb1bco88wqkMA:9 a=wPNLvfGTeEIA:10 a=AjGcO6oz07-iQ99wixmX:22 a=TPcZfFuj8SYsoCJAFAiX:22 a=LP-oT3CeHzb3Kpa8nOvR:22 a=HkZW87K1Qel5hWWM3VKY:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933037AbeDIAit (ORCPT ); Sun, 8 Apr 2018 20:38:49 -0400 Received: from mail-co1nam03on0120.outbound.protection.outlook.com ([104.47.40.120]:40064 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932971AbeDIAio (ORCPT ); Sun, 8 Apr 2018 20:38:44 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Yisheng Xie , Andi Kleen , Chris Salls , Christopher Lameter , David Rientjes , Ingo Molnar , Naoya Horiguchi , Tan Xiaojun , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 140/162] mm/mempolicy: add nodes_empty check in SYSC_migrate_pages Thread-Topic: [PATCH AUTOSEL for 4.4 140/162] mm/mempolicy: add nodes_empty check in SYSC_migrate_pages Thread-Index: AQHTz5nWEWW5pFGGVEivzIuPrCMj5Q== Date: Mon, 9 Apr 2018 00:29:36 +0000 Message-ID: <20180409002738.163941-140-alexander.levin@microsoft.com> References: <20180409002738.163941-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002738.163941-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1125;7:QJa4MZXxikoZvtf2T5TESHUr2TImb9HS83nDVEvLUbZTIAT2CWS9GmVfM94Y4GLIhgmV85HNLSqZ9o1N56qpYsA/qvAAmVg8uQUvyKV1cp/iNwblzSGfBsvD7WIwvoK8lroWOeerT+EtetdvVqR7Wuzh9z9BKdh8nz44nkYv0UCS3ohHPencwR0DiMVNjSKMqXJ06xUC07nE6IlML1/u7oE3FCjMbmD9Vw8ZZ9CdFSookeJcmPv8Yk3f4Orfx/KC;20:5IKT1ZphXtuos4qeEmj6dfC82Pi4x/t/XN35rYB0I3e3oZpamVbNP5hP2Z+Slu4JNGOq9JoQMrZuvmWxLifxvGBrCRN9R6s8N65mkUYQh1NCgRi8pMClMcDNLg/9XCxZnIxSHdhf4805iKW+0scf7Pe85c1nPxikZc1i9c2snTE= X-MS-Office365-Filtering-Correlation-Id: 9076c332-51c5-492c-a9b0-08d59db23e3f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020);SRVR:DM5PR2101MB1125; x-ms-traffictypediagnostic: DM5PR2101MB1125: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(192374486261705)(50582790962513)(211936372134217)(42068640409301)(153496737603132)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1125;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1125; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(39380400002)(366004)(376002)(396003)(189003)(199004)(2906002)(25786009)(6512007)(10090500001)(3280700002)(10290500003)(6666003)(6306002)(3660700001)(316002)(110136005)(54906003)(11346002)(107886003)(2616005)(476003)(446003)(36756003)(7416002)(99286004)(86612001)(53936002)(4326008)(486006)(6436002)(3846002)(81156014)(305945005)(966005)(5250100002)(1076002)(102836004)(14454004)(66066001)(7736002)(105586002)(81166006)(59450400001)(106356001)(8676002)(97736004)(6116002)(6506007)(6486002)(5660300001)(186003)(76176011)(22452003)(72206003)(478600001)(2501003)(2900100001)(26005)(86362001)(8936002)(68736007)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1125;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: mGckVFTeLoHgUIbxuWuYIFGPkyAznfy9GWMClkBf7iZuIrCO42aPigAjLM8gSyxY6UGeC/kBDvoAJummsZU8jKFZEEwhNhVQJwtjH7ih2MTk4zw5/TijqseFV5fZWfon2t9EQrz9FvOQ3c9bzYoXXgv52rCxRTMKFMKPn+nNbjfmdFOYshJyuFcBWiEjQl3YDKQfxQXGbJ1TnpUt+AZT1xDcQ4nYVNIVFC1R6CaY4wTHoKiPUJvkJZmR9AO2iT424ylvoKS/STW0FErfmVlU0aZpTWZqjXWfbHwS8cbA39+Bu1J2QQWo+B+W6PRLw/kay5kpboAbOknr8vSuTYmCml+12b8IbT43MZTuHAAEhhhkpv1loY6NRFcAgxqfSdMMDPoDANqAdqv3nIEv+bs4B/c8h+pwAQajyxJawkFaAsc= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9076c332-51c5-492c-a9b0-08d59db23e3f X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:29:36.6151 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1125 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: From: Yisheng Xie [ Upstream commit 0486a38bcc4749808edbc848f1bcf232042770fc ] As in manpage of migrate_pages, the errno should be set to EINVAL when none of the node IDs specified by new_nodes are on-line and allowed by the process's current cpuset context, or none of the specified nodes contain memory. However, when test by following case: new_nodes =3D 0; old_nodes =3D 0xf; ret =3D migrate_pages(pid, old_nodes, new_nodes, MAX); The ret will be 0 and no errno is set. As the new_nodes is empty, we should expect EINVAL as documented. To fix the case like above, this patch check whether target nodes AND current task_nodes is empty, and then check whether AND node_states[N_MEMORY] is empty. Link: http://lkml.kernel.org/r/1510882624-44342-4-git-send-email-xieyisheng= 1@huawei.com Signed-off-by: Yisheng Xie Acked-by: Vlastimil Babka Cc: Andi Kleen Cc: Chris Salls Cc: Christopher Lameter Cc: David Rientjes Cc: Ingo Molnar Cc: Naoya Horiguchi Cc: Tan Xiaojun Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/mempolicy.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 6196505a1119..77d6f750af3c 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1410,10 +1410,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned= long, maxnode, goto out_put; } =20 - if (!nodes_subset(*new, node_states[N_MEMORY])) { - err =3D -EINVAL; + task_nodes =3D cpuset_mems_allowed(current); + nodes_and(*new, *new, task_nodes); + if (nodes_empty(*new)) + goto out_put; + + nodes_and(*new, *new, node_states[N_MEMORY]); + if (nodes_empty(*new)) goto out_put; - } =20 err =3D security_task_movememory(task); if (err) --=20 2.15.1