From patchwork Thu Feb 22 21:40:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sowmini Varadhan X-Patchwork-Id: 876847 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="SBrQZ9Nj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3znSvY2j2Sz9s00 for ; Fri, 23 Feb 2018 09:00:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751729AbeBVWAG (ORCPT ); Thu, 22 Feb 2018 17:00:06 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:34460 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751590AbeBVWAF (ORCPT ); Thu, 22 Feb 2018 17:00:05 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w1MLugkp096386; Thu, 22 Feb 2018 22:00:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : to; s=corp-2017-10-26; bh=z5RN/xrCwJ5iKwSKfzPFZtv2khuxhpD5pBJ8xTiK23o=; b=SBrQZ9NjfMauRUnGqecT8HzGtK8xwoSM8kNiHqitBDQi9wi8npbb1FDnmVR1/PpDZTt1 X3cWrWPJKY+YWrzVDoSgt8budqu5/zXsw9Fnsgjvfk8dq27z4U7XjU5tArE07eX8w72M 54l7AbofHcvIFACnv+1kCXDri9v8Vw/EpkZBQ6iHpKDtsYuZUPHFm39QfS2Ow/LU7agt 3FoyWOZEdve2ImNTL75ZFEiHfLHnf5I3+PuP3DAYnSVfkZAFsqsjrJOfjrIF5he5b5Zw k/crfvmeZkRXOQ8NOKP05RSNDBXiiTN5BtcUxtcD4w1jF27mUcBukPiQk0jOvkehStmE lw== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2ga62903n8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Feb 2018 22:00:03 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w1MM03YD032638 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 22 Feb 2018 22:00:03 GMT Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w1MM023n017536; Thu, 22 Feb 2018 22:00:02 GMT Received: from ipftiger1.us.oracle.com (/10.208.179.35) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Feb 2018 14:00:02 -0800 From: Sowmini Varadhan To: netdev@vger.kernel.org Cc: davem@davemloft.net, sowmini.varadhan@oracle.com, santosh.shilimkar@oracle.com Subject: [PATCH net-next] rds: rds_msg_zcopy should return error of null rm->data.op_mmp_znotifier Date: Thu, 22 Feb 2018 13:40:27 -0800 Message-Id: <1519335627-143092-1-git-send-email-sowmini.varadhan@oracle.com> X-Mailer: git-send-email 1.7.1 To: sowmini.varadhan@oracle.com X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8812 signatures=668677 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1802220272 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org if either or both of MSG_ZEROCOPY and SOCK_ZEROCOPY have not been specified, the rm->data.op_mmp_znotifier allocation will be skipped. In this case, it is invalid ot pass down a cmsghdr with RDS_CMSG_ZCOPY_COOKIE, so return EINVAL from rds_msg_zcopy for this case. Reported-by: syzbot+f893ae7bb2f6456dfbc3@syzkaller.appspotmail.com Fixes: 0cebaccef3ac ("rds: zerocopy Tx support.") Signed-off-by: Sowmini Varadhan Acked-by: Willem de Bruijn Acked-by: Santosh Shilimkar --- net/rds/send.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/net/rds/send.c b/net/rds/send.c index 028ab59..c848cbb 100644 --- a/net/rds/send.c +++ b/net/rds/send.c @@ -939,7 +939,8 @@ static int rds_cmsg_zcopy(struct rds_sock *rs, struct rds_message *rm, { u32 *cookie; - if (cmsg->cmsg_len < CMSG_LEN(sizeof(*cookie))) + if (cmsg->cmsg_len < CMSG_LEN(sizeof(*cookie)) || + !rm->data.op_mmp_znotifier) return -EINVAL; cookie = CMSG_DATA(cmsg); rm->data.op_mmp_znotifier->z_cookie = *cookie;