From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17A6DC43603 for ; Wed, 18 Dec 2019 08:12:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E24D824683 for ; Wed, 18 Dec 2019 08:12:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IlDG0ZZJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726750AbfLRIMk (ORCPT ); Wed, 18 Dec 2019 03:12:40 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:38932 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725535AbfLRIMj (ORCPT ); Wed, 18 Dec 2019 03:12:39 -0500 Received: by mail-pf1-f193.google.com with SMTP id q10so785008pfs.6 for ; Wed, 18 Dec 2019 00:12:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=l4iRoC8mesquwD3sEoRNvJ1v8/9g9MjPFjk/sxgFfMA=; b=IlDG0ZZJJb9Pre75/5vwSqRKxU36uV2qdhNrCIgYg0+qN3iLAGfMDkbTjtuW5+jltg 3mhe0q+7NwJc5S6I3c0yELROqpXEKASD+ipm8oHRK1sm29n7HmjiOvfH13eemq3kxaLL KYN/kYl6QRQGLkvBZH6Sm4pX4bBokX851J1WkGp2D4OeQnQmoF1zMYdlyoTq5HDzz08A cRIaIv65+OtrQX13ZORr2MX9eihsWND+TRisW1Zb5OkEbI7U6kspQDXeuLyjMXYm0AG1 MfP3AqaMo7cdHlbTQ9mqylMvawkjVJ4mzRwAnLj9VlfX6CgAJIv+/8dRN9WgOecftg1K tFog== 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=l4iRoC8mesquwD3sEoRNvJ1v8/9g9MjPFjk/sxgFfMA=; b=W0Tr8B4icEmi1twLsxKQ0qWfBvYd4/7fE/Cevfxp7CytmAZMtgvPnARbsyeOuekKUh +J3giMq7HsS7CasHKLGMMu4Nb49AImlyTa86rucaAUsKALRSm1Lu6iuK7paj3vsHboLo Kq6sRI5mdWycOLsIQSkOESghCLhyqSGa2cbF0dR4sfmqwYmq/dqdPfL2TuQhFRm5GMmY 2gHH1ztYf5gUR8bslrSNMVO/8uhy8PebC3NErEfZBXktEPJmOp/AyDqtiDmB1OF4uyyM nspMtTLKCKVRpmIi9DMY0T7mGPt/aGyUa22iHY39VF4Hl29ZejYtDn2p6mSfSuJ7IbSA d/nA== X-Gm-Message-State: APjAAAUbJ6JFHI2W4Ht/MmexSbja1kdX6ujm89eY1zyACyL/Y4Ib78Wg 3yOobQ36fcANbRkMxXh8BwY= X-Google-Smtp-Source: APXvYqzKWeuaPyKxCItmw3aEvfJ5aUD5LEO0GJkp0O15myJgAma26F+K5ir655Hbx4LIyBNoslxqMA== X-Received: by 2002:a63:f24b:: with SMTP id d11mr1549784pgk.381.1576656759200; Wed, 18 Dec 2019 00:12:39 -0800 (PST) Received: from localhost.localdomain ([222.151.198.97]) by smtp.gmail.com with ESMTPSA id s1sm1799181pgv.87.2019.12.18.00.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2019 00:12:38 -0800 (PST) From: Prashant Bhole To: "David S . Miller" , "Michael S . Tsirkin" , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer Cc: Prashant Bhole , Jason Wang , David Ahern , Jakub Kicinski , John Fastabend , Toshiaki Makita , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , netdev@vger.kernel.org Subject: [RFC net-next 07/14] tuntap: check tun_msg_ctl type at necessary places Date: Wed, 18 Dec 2019 17:10:43 +0900 Message-Id: <20191218081050.10170-8-prashantbhole.linux@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191218081050.10170-1-prashantbhole.linux@gmail.com> References: <20191218081050.10170-1-prashantbhole.linux@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tun_msg_ctl is used by vhost_net to communicate with tuntap. We will introduce another type in soon. As a preparation this patch adds conditions to check tun_msg_ctl type at necessary places. Signed-off-by: Prashant Bhole --- drivers/net/tap.c | 7 +++++-- drivers/net/tun.c | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index a6d63665ad03..a0a5dc18109a 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -1203,6 +1203,7 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m, struct tap_queue *q = container_of(sock, struct tap_queue, sock); struct tun_msg_ctl *ctl = m->msg_control; struct xdp_buff *xdp; + void *ptr = NULL; int i; if (ctl && (ctl->type == TUN_MSG_PTR)) { @@ -1213,8 +1214,10 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m, return 0; } - return tap_get_user(q, ctl ? ctl->ptr : NULL, &m->msg_iter, - m->msg_flags & MSG_DONTWAIT); + if (ctl && ctl->type == TUN_MSG_UBUF) + ptr = ctl->ptr; + + return tap_get_user(q, ptr, &m->msg_iter, m->msg_flags & MSG_DONTWAIT); } static int tap_recvmsg(struct socket *sock, struct msghdr *m, diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 683d371e6e82..1e436d9ec4e1 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2529,6 +2529,7 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) struct tun_struct *tun = tun_get(tfile); struct tun_msg_ctl *ctl = m->msg_control; struct xdp_buff *xdp; + void *ptr = NULL; if (!tun) return -EBADFD; @@ -2560,7 +2561,10 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) goto out; } - ret = tun_get_user(tun, tfile, ctl ? ctl->ptr : NULL, &m->msg_iter, + if (ctl && ctl->type == TUN_MSG_UBUF) + ptr = ctl->ptr; + + ret = tun_get_user(tun, tfile, ptr, &m->msg_iter, m->msg_flags & MSG_DONTWAIT, m->msg_flags & MSG_MORE); out: -- 2.21.0