From patchwork Mon Nov 2 16:14:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 1392350 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=arista.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=arista.com header.i=@arista.com header.a=rsa-sha256 header.s=googlenew header.b=XQa4ZCTJ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CPygB54RPz9sVv for ; Tue, 3 Nov 2020 03:15:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726925AbgKBQO4 (ORCPT ); Mon, 2 Nov 2020 11:14:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726664AbgKBQOw (ORCPT ); Mon, 2 Nov 2020 11:14:52 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F991C0617A6 for ; Mon, 2 Nov 2020 08:14:52 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id s9so15262078wro.8 for ; Mon, 02 Nov 2020 08:14:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z6618xJXhXqXHodxwmKYhO6tkPP3WPr6UxJwjTPsCDQ=; b=XQa4ZCTJc70MalCEMRbstL9yhQ4aW+Muw9kK/V815HmkgCapYFtoyDWH+xFMOxXqEy J/CNvNCaQJd/n9/rWezWyW2+FWtl00gTQTyM3cfj/AMrnGmFUvVghNMV0zBZqftPDYm9 it8r9jiiVUoJEPLFgdsnIn0s9JFsGJ2nnJnAlvum6wVD/sp95K3XDHvIldVqeXnXGI6n bsruMepaFNrqeqvpOCCMUIoyNx/Vp61vhMXhZNSIJhDzFk/AVse7Z1Z8Xk+licP2bPTn XdKSMzWCaHyTYfCrHREhRCF7PlP9/EUup2yCefARbeot8neoBX55alipTDWy7dhuPLf7 3VJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z6618xJXhXqXHodxwmKYhO6tkPP3WPr6UxJwjTPsCDQ=; b=OtqFtiQslM8/ek5j57QZzv12gTVBZUfyOomX/UkJaINGjVrxzG4I/KCFiv6uNE8+PL prc/YIuTJwEhmPI2sA4Wq9en0zC2DBEsNcFCywmlHt8RkD794MsMtdi9fuvCD4Zc/yZ3 04YbPFcbcRtGCwkmGYNxz+H4LVgWg20EikUw/yOef3uTllczbGwDXZBt+m5iGpeb9P1+ ZOVBo/fNDxuHDJu90ax2i3txTnuhkQ7sYh6sNdM9pYaQA0HdQLTBSq22LNzsx4ZWPpkQ L0TMAL51abcSEkOdUwZtchzedHw9EHrx8XhwvKDczoVG3dXwjiBGgHDllEyUrPuz5ai3 6wQQ== X-Gm-Message-State: AOAM5303mEvFoMIlvfsLR5h6hdOaQGa3WCd2zCusCBndwl8FsHrjcqKb d3UJSs34o8zfCBsK1o6mhoBb3w== X-Google-Smtp-Source: ABdhPJyx8kw0GtHnHiZVHl/JP/ocb946aS8LqaiSCCdAWExQH/L/4D4M3A9HeSVnpR5lCk8w6YgceA== X-Received: by 2002:adf:bd86:: with SMTP id l6mr21763532wrh.205.1604333690852; Mon, 02 Nov 2020 08:14:50 -0800 (PST) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id x18sm24127878wrg.4.2020.11.02.08.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 08:14:50 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Steffen Klassert , "David S. Miller" , Jakub Kicinski , Herbert Xu , Hillf Danton , netdev@vger.kernel.org, syzbot+a7e701c8385bd8543074@syzkaller.appspotmail.com Subject: [PATCH v2 1/3] xfrm/compat: Translate by copying XFRMA_UNSPEC attribute Date: Mon, 2 Nov 2020 16:14:45 +0000 Message-Id: <20201102161447.1266001-2-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201102161447.1266001-1-dima@arista.com> References: <20201102161447.1266001-1-dima@arista.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org xfrm_xlate32() translates 64-bit message provided by kernel to be sent for 32-bit listener (acknowledge or monitor). Translator code doesn't expect XFRMA_UNSPEC attribute as it doesn't know its payload. Kernel never attaches such attribute, but a user can. I've searched if any opensource does it and the answer is no. Nothing on github and google finds only tfcproject that has such code commented-out. What will happen if a user sends a netlink message with XFRMA_UNSPEC attribute? Ipsec code ignores this attribute. But if there is a monitor-process or 32-bit user requested ack - kernel will try to translate such message and will hit WARN_ONCE() in xfrm_xlate64_attr(). Deal with XFRMA_UNSPEC by copying the attribute payload with xfrm_nla_cpy(). In result, the default switch-case in xfrm_xlate64_attr() becomes an unused code. Leave those 3 lines in case a new xfrm attribute will be added. Fixes: 5461fc0c8d9f ("xfrm/compat: Add 64=>32-bit messages translator") Reported-by: syzbot+a7e701c8385bd8543074@syzkaller.appspotmail.com Signed-off-by: Dmitry Safonov --- net/xfrm/xfrm_compat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/xfrm/xfrm_compat.c b/net/xfrm/xfrm_compat.c index e28f0c9ecd6a..17edbf935e35 100644 --- a/net/xfrm/xfrm_compat.c +++ b/net/xfrm/xfrm_compat.c @@ -234,6 +234,7 @@ static int xfrm_xlate64_attr(struct sk_buff *dst, const struct nlattr *src) case XFRMA_PAD: /* Ignore */ return 0; + case XFRMA_UNSPEC: case XFRMA_ALG_AUTH: case XFRMA_ALG_CRYPT: case XFRMA_ALG_COMP: From patchwork Mon Nov 2 16:14:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 1392352 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=arista.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=arista.com header.i=@arista.com header.a=rsa-sha256 header.s=googlenew header.b=U+Gj6XSR; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CPygJ2Cl1z9sVk for ; Tue, 3 Nov 2020 03:15:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726875AbgKBQPH (ORCPT ); Mon, 2 Nov 2020 11:15:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726771AbgKBQOz (ORCPT ); Mon, 2 Nov 2020 11:14:55 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 759AAC061A47 for ; Mon, 2 Nov 2020 08:14:53 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id w14so15256534wrs.9 for ; Mon, 02 Nov 2020 08:14:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6oQK3SCG2X0OqS0yyKhp7n4T1apDPtlUAe42OHVNz1g=; b=U+Gj6XSRpsl6pLpA+QTmOVmB66RFKQJCOwKzcr+1mFCmixjP+nIVTlQAFEso30z1wz O0klYqGgOGCslpkhSP7luB/MllmRBxRCytJslqVn3qVMk13gAd8VKRuLL/cEvxm500JV 9jpcB8e/V+nSFGnmhTGYGtxBWObnG8pJRmMEu/HOnPQ3j88PO9P4e2S9L7kIBd+7LtYA NFtYOpPC/+6JJQAfdMOqMpMeyI3ez0bDILbfJuWEqWfPPxkZ9ExZ4A3rwXFcaWLmHGEO xPYazqP83Uq99S1QIRVWEDPbeZR9O2e7k6Pu2xVFSRnx2e2o/86ym/Q0Bgbd0OdDx+Ar cu5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6oQK3SCG2X0OqS0yyKhp7n4T1apDPtlUAe42OHVNz1g=; b=hBu2u9EDcCyDRPM/J6OJcm9Fg2QPxBnGEZmKmlCF9FdTxqdpba8Xb3qT2h7Tf3XDMj Pikq3Ptz7zIGxxV+X6Ovq3TCDerh68Jke8coXXsqGxImkaJu4sQ8j1ZNJYx76/wwfNrL 1z+1i2rZ9uuUh08NcvjQMy+HhhG0wtiMAglnrls9S0paWkfsd3eX8cYvNbCndn9cggBH 7VobVXbXQ2U5aqu5AY4WEuuC56mQOgfRfEapMkvthpo5Td70TrQX0YNWgtvsmtKr79OU IsBvXWAS5Z1Md56kH23kppwj0WCCbS9eu4NXGHvJfCGOdq31VW2mV4/XSoWdfIKze84c oDpA== X-Gm-Message-State: AOAM530KDWgXgFCzB3+ynTfPcy4haZKj+8Ck2xWihM+XQi47yhqbmrbw X0uw9jmPjyWKDG+jnybuUr3M9zk+5FtCnkzf X-Google-Smtp-Source: ABdhPJwCEfpj+fMa6liV5sL/DNJ1tclbc/6Zec8uGWaFEja2jNV69ckqw4hFkdzT/4DAxedt7W/r4w== X-Received: by 2002:adf:9502:: with SMTP id 2mr19336780wrs.5.1604333692119; Mon, 02 Nov 2020 08:14:52 -0800 (PST) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id x18sm24127878wrg.4.2020.11.02.08.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 08:14:51 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Steffen Klassert , "David S. Miller" , Jakub Kicinski , Herbert Xu , Hillf Danton , netdev@vger.kernel.org, syzbot+c43831072e7df506a646@syzkaller.appspotmail.com Subject: [PATCH v2 2/3] xfrm/compat: memset(0) 64-bit padding at right place Date: Mon, 2 Nov 2020 16:14:46 +0000 Message-Id: <20201102161447.1266001-3-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201102161447.1266001-1-dima@arista.com> References: <20201102161447.1266001-1-dima@arista.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 32-bit messages translated by xfrm_compat can have attributes attached. For all, but XFRMA_SA, XFRMA_POLICY the size of payload is the same in 32-bit UABI and 64-bit UABI. For XFRMA_SA (struct xfrm_usersa_info) and XFRMA_POLICY (struct xfrm_userpolicy_info) it's only tail-padding that is present in 64-bit payload, but not in 32-bit. The proper size for destination nlattr is already calculated by xfrm_user_rcv_calculate_len64() and allocated with kvmalloc(). xfrm_attr_cpy32() copies 32-bit copy_len into 64-bit attribute translated payload, zero-filling possible padding for SA/POLICY. Due to a typo, *pos already has 64-bit payload size, in a result next memset(0) is called on the memory after the translated attribute, not on the tail-padding of it. Fixes: 5106f4a8acff ("xfrm/compat: Add 32=>64-bit messages translator") Reported-by: syzbot+c43831072e7df506a646@syzkaller.appspotmail.com Signed-off-by: Dmitry Safonov --- 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 17edbf935e35..556e9f33b815 100644 --- a/net/xfrm/xfrm_compat.c +++ b/net/xfrm/xfrm_compat.c @@ -388,7 +388,7 @@ static int xfrm_attr_cpy32(void *dst, size_t *pos, const struct nlattr *src, memcpy(nla, src, nla_attr_size(copy_len)); nla->nla_len = nla_attr_size(payload); - *pos += nla_attr_size(payload); + *pos += nla_attr_size(copy_len); nlmsg->nlmsg_len += nla->nla_len; memset(dst + *pos, 0, payload - copy_len); From patchwork Mon Nov 2 16:14:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 1392351 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=arista.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=arista.com header.i=@arista.com header.a=rsa-sha256 header.s=googlenew header.b=AaGBSGvj; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CPygG3vFPz9sVk for ; Tue, 3 Nov 2020 03:15:06 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726860AbgKBQPG (ORCPT ); Mon, 2 Nov 2020 11:15:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726385AbgKBQOz (ORCPT ); Mon, 2 Nov 2020 11:14:55 -0500 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFE1EC0617A6 for ; Mon, 2 Nov 2020 08:14:54 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id p22so9958526wmg.3 for ; Mon, 02 Nov 2020 08:14:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arista.com; s=googlenew; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YP7gpeIdOxquq/TfUCec+7EbTBaII9gjVTUVcNqSjPU=; b=AaGBSGvjhehUR423BN+bvavmMxSWC0jcslz8PXWQI1XmoPgaS4nFW1xD9lIqMKt6fJ ig21d8KFcShPzUP/t8fEo7pGj0B6s2gUgHYjWwgJIZRyTtpn5h9wG0Qz6FBwkIsLw0bL 24hUoOXsYRm/C22dDpF7S6ZydHjBZpi11cTodG1Ywc2Ung4P2MtJm6ArmjSLh4qgyO5/ 6+TomzWOaYB/y3a/cU5XSRDD3kOaeVuZHBLe4iIK6rqQz2JfBryqGoi4b1hylhPbAnVa rd8uQMwnTQp9b643eLX3ctwUTkzYM5XSL1r6wcHYpGx4zaGq/mZZCS68XmJP+ybcuyqH NEzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YP7gpeIdOxquq/TfUCec+7EbTBaII9gjVTUVcNqSjPU=; b=EiEHcLmKJyU8Uhwlm53wNx9t8pU6yik3HHwRt+rmUJMUGKtzYEWAQ991zPWk94z4hc NOFl21rsIzMzG3Rp2FKCoiLLDaQMCmC3u6l71/ANpbfl2PDwgPXfsKtEs4BppfEHO3bT bfUOCw7yPMsGOJPhSh0JMvogHmo1clRwZq2YlwafYwY7RAY1YciAr+XCFPZ0Em9TlxSU 7uXa6n20qSgcvhlAzt/cG0EMLlDtg5J1gomo+ahTvj69X8jssI5Z43Vn2bjQ8v5eOeXm fnFd6au6cp5my0porjj89CjRJDcH2fG5ZDWNxndnBE4a7oDoUW5G9wLwiIUZBMYwVZsj gY9w== X-Gm-Message-State: AOAM531d7tdga2mZFuT8vi7K9MHt21TA/uuNonCySSEAfzd2ZNNOaFIq hnoGmMEj0JJCtZlW1L+nG/H8bw== X-Google-Smtp-Source: ABdhPJw3RBVQO147VlnGF8efd93BaENdZO5NDLkR4YamM5z8tQtiVuJe8uc3wyzwHceF473tMBXz3g== X-Received: by 2002:a05:600c:209:: with SMTP id 9mr18317719wmi.89.1604333693619; Mon, 02 Nov 2020 08:14:53 -0800 (PST) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id x18sm24127878wrg.4.2020.11.02.08.14.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 08:14:52 -0800 (PST) From: Dmitry Safonov To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <0x7f454c46@gmail.com>, Dmitry Safonov , Steffen Klassert , "David S. Miller" , Jakub Kicinski , Herbert Xu , Hillf Danton , netdev@vger.kernel.org Subject: [PATCH v2 3/3] xfrm/compat: Don't allocate memory with __GFP_ZERO Date: Mon, 2 Nov 2020 16:14:47 +0000 Message-Id: <20201102161447.1266001-4-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201102161447.1266001-1-dima@arista.com> References: <20201102161447.1266001-1-dima@arista.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 32-bit to 64-bit messages translator zerofies needed paddings in the translation, the rest is the actual payload. Don't allocate zero pages as they are not needed. Fixes: 5106f4a8acff ("xfrm/compat: Add 32=>64-bit messages translator") Signed-off-by: Dmitry Safonov --- 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 556e9f33b815..d8e8a11ca845 100644 --- a/net/xfrm/xfrm_compat.c +++ b/net/xfrm/xfrm_compat.c @@ -564,7 +564,7 @@ static struct nlmsghdr *xfrm_user_rcv_msg_compat(const struct nlmsghdr *h32, return NULL; len += NLMSG_HDRLEN; - h64 = kvmalloc(len, GFP_KERNEL | __GFP_ZERO); + h64 = kvmalloc(len, GFP_KERNEL); if (!h64) return ERR_PTR(-ENOMEM);