From patchwork Sun Nov 1 22:08:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alistair Delva X-Patchwork-Id: 1391880 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=FsnpzJJW; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CPVbZ4pr8z9sVM for ; Mon, 2 Nov 2020 09:10:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727382AbgKAWIv (ORCPT ); Sun, 1 Nov 2020 17:08:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38946 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727009AbgKAWIt (ORCPT ); Sun, 1 Nov 2020 17:08:49 -0500 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82964C0617A6 for ; Sun, 1 Nov 2020 14:08:49 -0800 (PST) Received: by mail-qk1-x74a.google.com with SMTP id k188so7661378qke.3 for ; Sun, 01 Nov 2020 14:08:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc :content-transfer-encoding; bh=NKp1/xBXDkl0efhdXNrgYc0O7jfhOuUU7342EXqTwg4=; b=FsnpzJJWXhtPreieRoDxDeeMlTQBlq/mJJqfi2mvOuie/Fj9mmqbbp644xxA+7EH/H nEu7H3reDXz2RiMRJHutBkb5adCfGBDTW5GaEN7o/p7bBO7cGBJuAeV84qQ1KVtorK1w ktmk3CF+IyQtw4aGPFzI05sRg6Qq3c0gZebh6hHfG2yrCDL5qvFxab8lSGvrHUaDLubp 0rCHIFcEz14jVVG3XFWfzVgyNPUmnBA8T8owbq/DSh7c7hcyBL//HVd3ouaqFEz4HkmE CkWnjchPAcxUN9Vxrcs/yz+cutc2vQ9rMRoYZLJQ57+V2TLBVDU+tK9OaI9e0MLW9P+H rnSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc:content-transfer-encoding; bh=NKp1/xBXDkl0efhdXNrgYc0O7jfhOuUU7342EXqTwg4=; b=e0Ng/mxHh7NKK4nmhicVesxLHB0Cw/DNYsstAtYvTkRqDI0PVX5SdeHiLXExgJapVn uhIrHf7ksJqXuuIfq6BFyrXRKXW5hI9BWyHAHmPzud9fk+ItCnij+xqQ+KaQSwKC4AT6 jFucHxtHBsz1KFokveCIrMc8KXSQBAJojR48rcfbZnE7O/PEqXr8hNL/22EF/AOeNIZS WUfe+PSRjPCeM2x2jS3lODrVKunvoZdksOBYUADlQNzBy00VdJGLLUV/D5R5QQNnjYhY RNmYIB7axlBntLVRVp8h2agfhvZAQT55c/VH7ObbZvJkD+AnOqhVwQtrcrhc4fhjHu9S mybA== X-Gm-Message-State: AOAM530vuC7LykZaNZkSoCtiaWZRURedclxrK+NVLoxYdatmf797ppN6 HvuP2ilxFHqRc7IjGPnwpY/ShUJowmM= X-Google-Smtp-Source: ABdhPJxP49gIPiKCuz6nQCcKDAcO3PZrEReCiIRv/Hl/O9yFNY5Xy2r0lt3sA3tBRNUVU6I+TBC4G7b5tu4= Sender: "adelva via sendgmr" X-Received: from adelva.mtv.corp.google.com ([2620:15c:211:200:3e52:82ff:fe5f:1593]) (user=adelva job=sendgmr) by 2002:a0c:eec4:: with SMTP id h4mr19229603qvs.52.1604268527352; Sun, 01 Nov 2020 14:08:47 -0800 (PST) Date: Sun, 1 Nov 2020 14:08:45 -0800 Message-Id: <20201101220845.2391858-1-adelva@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.29.1.341.ge80a0c044ae-goog Subject: [PATCH] xfrm/compat: Remove use of kmalloc_track_caller From: Alistair Delva To: Dmitry Safonov <0x7f454c46@gmail.com> Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Jakub Kicinski , "David S . Miller" , Herbert Xu , kernel-team@android.com, " =?utf-8?q?Maciej_=C5=BBenczykowski?= " , Steffen Klassert Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The __kmalloc_track_caller symbol is not exported if SLUB/SLOB are enabled instead of SLAB, which breaks the build on such configs when CONFIG_XFRM_USER_COMPAT=m. ERROR: "__kmalloc_track_caller" [net/xfrm/xfrm_compat.ko] undefined! Other users of this symbol are 'bool' options, but changing this to bool would require XFRM_USER to be built in as well, which doesn't seem worth it. Go back to kmalloc(). Fixes: 96392ee5a13b9 ("xfrm/compat: Translate 32-bit user_policy from sockptr") Cc: Dmitry Safonov <0x7f454c46@gmail.com> Cc: Maciej Żenczykowski Cc: Steffen Klassert Signed-off-by: Alistair Delva Reviewed-by: Dmitry Safonov <0x7f454c46@gmail.com> --- net/xfrm/xfrm_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/xfrm/xfrm_compat.c b/net/xfrm/xfrm_compat.c index e28f0c9ecd6a..c1dee0696dfb 100644 --- a/net/xfrm/xfrm_compat.c +++ b/net/xfrm/xfrm_compat.c @@ -585,7 +585,7 @@ static int xfrm_user_policy_compat(u8 **pdata32, int optlen) if (optlen < sizeof(*p)) return -EINVAL; - data64 = kmalloc_track_caller(optlen + 4, GFP_USER | __GFP_NOWARN); + data64 = kmalloc(optlen + 4, GFP_USER | __GFP_NOWARN); if (!data64) return -ENOMEM;