From patchwork Wed Jul 22 13:22:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ken-ichirou MATSUZAWA X-Patchwork-Id: 498541 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7E0F81402B4 for ; Wed, 22 Jul 2015 23:22:43 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=s2Nw0RJr; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933442AbbGVNWj (ORCPT ); Wed, 22 Jul 2015 09:22:39 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:33864 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756659AbbGVNWg (ORCPT ); Wed, 22 Jul 2015 09:22:36 -0400 Received: by pdbbh15 with SMTP id bh15so93140671pdb.1 for ; Wed, 22 Jul 2015 06:22:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=6Ft42ZuNT4U0j5NxUkJOstYOTAT3guboAjCkTr79X9E=; b=s2Nw0RJrowOyEyy/5ImCCXjGJEiM2ZgYB1Bv7b1i/IM5V1rNNnqTYNerhrL1TSgksN vGnQ9BX+7pum/FlgBZ8jYXbWZLkiDSkQ9zfOsw8cBz4WlEuAB+j4RJTbVYmo2A586d0y 0P6I18xr+i7zcOS3i0huSg+36eTNXsdDQGYFJ/f6fvLky5eXEZ8hPY76VBj11+GlBDRp /SNpgKKWQn6pM+52FFAqXes+gHzcltzjmXY+AOtRQ3IwB1OIRDvkGXm9xENP9LJ/dKNg 2mGpE3OdUKaPpRrNAq/fEtuS8Ybul0enaUg4xfEK9thbFJOzLBlMKKzazVDD1M+bRL90 0T/g== X-Received: by 10.70.44.199 with SMTP id g7mr5916277pdm.152.1437571355795; Wed, 22 Jul 2015 06:22:35 -0700 (PDT) Received: from gmail.com (softbank220009032004.bbtec.net. [220.9.32.4]) by smtp.gmail.com with ESMTPSA id pn6sm3395719pdb.72.2015.07.22.06.22.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 06:22:34 -0700 (PDT) Date: Wed, 22 Jul 2015 22:22:30 +0900 From: Ken-ichirou MATSUZAWA To: netdev@vger.kernel.org Subject: [RFC PATCH 4/5] netlink: mmap: update tx type check Message-ID: <20150722132230.GE18037@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We need to accept msg_iter.type 1(WRITE) which is set in sendto/sendmsg. Signed-off-by: Ken-ichirou MATSUZAWA --- net/netlink/af_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index a6fba4c..7e1610e 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2394,7 +2394,7 @@ static int netlink_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) * sendmsg(), but that's what we've got... */ if (netlink_tx_is_mmaped(sk) && - msg->msg_iter.type == ITER_IOVEC && + !(msg->msg_iter.type & (ITER_KVEC | ITER_BVEC)) && msg->msg_iter.nr_segs == 1 && msg->msg_iter.iov->iov_base == NULL) { err = netlink_mmap_sendmsg(sk, msg, dst_portid, dst_group,