From patchwork Fri Oct 30 02:25:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 1390669 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=YaXQ0fVY; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CMmQ93xLQz9sSG for ; Fri, 30 Oct 2020 13:26:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726152AbgJ3C0G (ORCPT ); Thu, 29 Oct 2020 22:26:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbgJ3C0F (ORCPT ); Thu, 29 Oct 2020 22:26:05 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18F26C0613D2 for ; Thu, 29 Oct 2020 19:26:05 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id k21so2410907wmi.1 for ; Thu, 29 Oct 2020 19:26:05 -0700 (PDT) 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=Cffn0GfYN+WIFr13ZpJjw/0tqOhXXXnigKty10nABv0=; b=YaXQ0fVYKz4iwdSGVlHjlXUO8QIdNqsj9lzso9QZ91FBIM/LqXErDk035fXTD7OXVz xDrp56nksbdQkIe6B9HZZ6axhv2aGJzCk5uA3EXUYC1v7zzI5gA+ich4/PcNyQ/qLqz4 hLueSqJkthTlJsAFVferUQxgqG0RKl/e7kMy0VhjAGOjbCO5IE8g4T6+wXGFguishGxQ 0bUkT65bfVLzfxo/i5fblwPelC7rSCbMWHLnqu5KWvzCgo2GoqNMBDAeKQCP/Fc0EKxd VjVaa8aSXsJQBc6QumIFM93AP0NFDaFJJ6ejqKOMMjJwaKrc772OLqZj8NTheQEfqzTk AAQQ== 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=Cffn0GfYN+WIFr13ZpJjw/0tqOhXXXnigKty10nABv0=; b=bqHyi2P9Gvxz7AUxluiZpqJgWMLwbtnpULBoAh9O52QGxT6JZd/e9Ocg8codvfJ6l3 3ExTXy/fDGfIQogHXawANDiFGB2GTCfC9tzF+o6pK4pH0IYAxBWrRjGKBDRyexgKHMsr n/Spxj3uwxaTvClnyccwNaXS/t99sEz7DOqWodn7fliVFff4nJrWdYo9rPKmbeyMRA9z RuLnpxAv/jzOL2Ay3dU/GR/RzWzPXfb8gOVBKatnJq1PPzVnbB0aeFjS/61dCXAkDNNK NWvD5UMZyiyT1TC+DCPlBucU2MyONGbQbzWoyQ4652IOAfuFv7QdkjrT8zRtG9B2547n sfTw== X-Gm-Message-State: AOAM533CbxVqexH2QQb2Zc17M28O4M+xK5+2z2HvEzYwSbX/MUHFlVil XsBjdY4kXErIcjfe1aPBE3igaA== X-Google-Smtp-Source: ABdhPJyYQbpl99Amn/qgVxUMfFO162iDjaySaks6WZ0A+OtEZqdAGdtEV3xKDtycI0A4wxozEO++Pw== X-Received: by 2002:a1c:398a:: with SMTP id g132mr2394304wma.51.1604024763775; Thu, 29 Oct 2020 19:26:03 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id i14sm2757170wml.24.2020.10.29.19.26.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 19:26:03 -0700 (PDT) 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 1/3] xfrm/compat: Translate by copying XFRMA_UNSPEC attribute Date: Fri, 30 Oct 2020 02:25:58 +0000 Message-Id: <20201030022600.724932-2-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030022600.724932-1-dima@arista.com> References: <20201030022600.724932-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. 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 Fri Oct 30 02:25:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 1390671 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=gE8wG1tR; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CMmQS17B9z9sSG for ; Fri, 30 Oct 2020 13:26:24 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726262AbgJ3C0W (ORCPT ); Thu, 29 Oct 2020 22:26:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726184AbgJ3C0H (ORCPT ); Thu, 29 Oct 2020 22:26:07 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E6B0C0613D2 for ; Thu, 29 Oct 2020 19:26:06 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id n15so4860890wrq.2 for ; Thu, 29 Oct 2020 19:26:06 -0700 (PDT) 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=X1EQkh492Mu2jcFb695EkgyNX5lh9rVoFrBg9UQoeOA=; b=gE8wG1tR4G4yLkiIiDSr6+pBvfL9AatK9YzKQjSAvJtAyWl0lohZh3WNinOoZsmfy2 B2QsH5H9CrDO5Kq50n35BKQQwWdNUG9+arReDbUsG0Cyu0N5Eq4TpN3bcSWqf3cje1pr v6i9781D1dreCqxDJOLDihMwRYwqF/7NS46WjlzhePNElyciKkzP6JEVpIQ7jDRReedj +74xyh7/drTx5vkcz1SkFh/qP8GqgjC4rTpashBt04QTAQcDtlwshIfXGTZ7mUzIcwI1 IGbkjoQmUUznnlFElGFHHL+R0mO0XOsyNpCvX0kcHo4/hr2JtduUw8CzyooRbpldXg8G gXUQ== 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=X1EQkh492Mu2jcFb695EkgyNX5lh9rVoFrBg9UQoeOA=; b=TEi3ELxWFijaLGnVxBlKQb7NSLomxYDRCH3Cmp3jw0HAHfwTRQUmWcFPxCuYGqFZqZ uYgcWYF09o5BwZCNChKJOrHszOj+dzhIIf/xEwtIIrUbuDDl4qrts7lnG4Cf8kedwVp5 icbYFtNWHZaADQQCiV4l2cCXxW+DRC7kB6aaadD7Sj0Zu5LYM1lOhmMifygxdMylhYWJ Y4+frZaUhQKG4vfsbjsssTTN8nlbpoU4JrTTAiFgqOl3SbC93t4TDt4i+/1Qzwg7Avas unKcGsuq0FOy7QEYJ4yGjTz4wKLrZfhcHMkH1lwcWSG7Vx2qc8tq42Fzn2I8FD5Hj97N MtPw== X-Gm-Message-State: AOAM5300q4E48SP0/I9gahnNtzMMjM57lR5MKjq+tg5ls7djzJUZyi97 F44mDQ14CEdEKLPSfNP6rU8Ul7YB0YLBaqkc X-Google-Smtp-Source: ABdhPJx8teNYuAv/WZxQLY7+jwpZuK1G1oCTxaw1VGWqelfSuG3g8UfppXc/mrFT+J0vhY7wV2DlFQ== X-Received: by 2002:a5d:490a:: with SMTP id x10mr59400wrq.289.1604024764926; Thu, 29 Oct 2020 19:26:04 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id i14sm2757170wml.24.2020.10.29.19.26.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 19:26:04 -0700 (PDT) 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 2/3] xfrm/compat: memset(0) 64-bit padding at right place Date: Fri, 30 Oct 2020 02:25:59 +0000 Message-Id: <20201030022600.724932-3-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030022600.724932-1-dima@arista.com> References: <20201030022600.724932-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. 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 Fri Oct 30 02:26:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Safonov X-Patchwork-Id: 1390670 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=Q4jgCNbS; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CMmQG349dz9sTf for ; Fri, 30 Oct 2020 13:26:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726246AbgJ3C0L (ORCPT ); Thu, 29 Oct 2020 22:26:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726210AbgJ3C0J (ORCPT ); Thu, 29 Oct 2020 22:26:09 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D7B0C0613D4 for ; Thu, 29 Oct 2020 19:26:07 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id c18so1554799wme.2 for ; Thu, 29 Oct 2020 19:26:07 -0700 (PDT) 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=0dSc/u2vFyuVIH9pLeGn6Txj8jzDcQIh2Oq8sqMcN9Q=; b=Q4jgCNbSL6ILYvuVYYrVqY1MX9KZDszP7B3nuS9o1g6DunZxcLKcvv3TOx2EHN4Jwr ZnoVlEFesIz7vpMBIuU5eYzLKKBKmoUz1yesKc2iDDFkY8T8IFJtQw8OtnmNj0+5pk+/ OY0KNi5DAWwixvYn+dnm3tsJO+4W4Kbre3ZRDNh8FEdI+FwDe+3DBi4CVQmfZL9NrPlc Bk0e9O8g7WvvSRQMHGj+Nm+9jxeaqJ/XU08/HlAdeYzHbq1i01A9nFsc16DOBAkXvmBL E+CFXkfPHFrV4FPbjzUVUe2zIQbDyEbzL/s/9NhIl1Lr3T+yMNoK5D9akT7OFwOTzSFf RG9w== 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=0dSc/u2vFyuVIH9pLeGn6Txj8jzDcQIh2Oq8sqMcN9Q=; b=cB0rTFrZynAnAB3s9BfVVdxDL0kVeHvQJ0AgFJKLsNyD4tmhcihFqaDzRZx3PPgQaq 1jg6YEKSudmDjCtpz910GBe9qMQYxuwbn16irKOrTShOFZ7+M3tDrgEHpFJtWYhaN+7a qRJlTJSn/8ifX7f93jyQoDSZoNdWpUZlOfBwSVy8jotOSUoUojzmDSCSF9kWszt0Lpeu R36gDnVYUua9ilAQSg7fuOKVYE5VDNPCVMmtCzbuPfzQWfxa245VDXzWHexFejjnaiAX rQda0iQXlTM7V1gtc7TCWYCOcXpo7CAxeuU+TDv9aSEw8m+PZLsNZJxCjXpQJWjoGSvc yRJg== X-Gm-Message-State: AOAM530t5kJkF62l+1X2AjCVVO6eCJpTv4mbaDCiMo93NAr3p5AFXluC k8duv699n0j8kgck2V9NlRY13A== X-Google-Smtp-Source: ABdhPJxu5DIa8TSCGmWh7GBS45lYXSHm2gfDhUjPWeZLCdWfEtvt3xCJm0a9LMNPck06YNScmAbsPw== X-Received: by 2002:a05:600c:22d9:: with SMTP id 25mr1942017wmg.21.1604024766044; Thu, 29 Oct 2020 19:26:06 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:e84:2480:228:f8ff:fe6f:83a8]) by smtp.gmail.com with ESMTPSA id i14sm2757170wml.24.2020.10.29.19.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 19:26:05 -0700 (PDT) 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 3/3] xfrm/compat: Don't allocate memory with __GFP_ZERO Date: Fri, 30 Oct 2020 02:26:00 +0000 Message-Id: <20201030022600.724932-4-dima@arista.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201030022600.724932-1-dima@arista.com> References: <20201030022600.724932-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. 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);