From patchwork Thu Aug 6 12:26:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 30840 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 6A62BB7088 for ; Thu, 6 Aug 2009 22:27:24 +1000 (EST) Received: by ozlabs.org (Postfix) id 53AB8DDDA0; Thu, 6 Aug 2009 22:27:24 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id A42B0DDD0C for ; Thu, 6 Aug 2009 22:27:23 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755006AbZHFM1H (ORCPT ); Thu, 6 Aug 2009 08:27:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755314AbZHFM1H (ORCPT ); Thu, 6 Aug 2009 08:27:07 -0400 Received: from mail-ew0-f214.google.com ([209.85.219.214]:41605 "EHLO mail-ew0-f214.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753355AbZHFM1F (ORCPT ); Thu, 6 Aug 2009 08:27:05 -0400 Received: by ewy10 with SMTP id 10so728479ewy.37 for ; Thu, 06 Aug 2009 05:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=IDKJOQxVFb8jKpZrCBrMSZFjfW1TJkbqZDWzlc0hkP4=; b=S+Q597GMafH3IhyGo8Di0dKJRN4h+TJAoaMp2aPiUlotXh6Ro5px6h0hSRoRT1wR/d Fc/q/eQTs+rI0yo+p3z0s3mlbeeTRXBA7HMTMb0IINK/bjD7SlJO8tvNO2S4Ymk66KhT dShK8vmwzXQWhYNI0lrFlzPmFcdHdcZcrdfKw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=U7MMEklYUrXVrFY/Ygcl/H+ircwg3Pti2RDUWm0Ji5E8zxTmwYGfbkafYpKO0djH/U JaSFcmgtD+xz5vT4IQ5VJDBmIYXnx9cVYfzlqoKS+WoY/aVClL9UxevFFWUowElRA1SQ 8iI46TH2ffotwH0c9u7YQp+ZSV+GPWY4KoGeQ= Received: by 10.210.65.16 with SMTP id n16mr9636452eba.78.1249561625421; Thu, 06 Aug 2009 05:27:05 -0700 (PDT) Received: from localhost.localdomain (iap-pxy-mow1.siemens.ru [212.248.25.26]) by mx.google.com with ESMTPS id 10sm144476eyz.31.2009.08.06.05.27.03 (version=SSLv3 cipher=RC4-MD5); Thu, 06 Aug 2009 05:27:04 -0700 (PDT) From: Dmitry Eremin-Solenikov To: netdev@vger.kernel.org Cc: "David S. Miller" , Sergey Lapin , linux-zigbee-devel@lists.sourceforge.net Subject: [PATCH 2/2] af_ieee802154: provide dummy get/setsockopt Date: Thu, 6 Aug 2009 16:26:26 +0400 Message-Id: <1249561586-26927-3-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1249561586-26927-2-git-send-email-dbaryshkov@gmail.com> References: <1249561586-26927-1-git-send-email-dbaryshkov@gmail.com> <1249561586-26927-2-git-send-email-dbaryshkov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Provide dummt get/setsockopt implementations to stop these syscalls from oopsing on our sockets. Signed-off-by: Dmitry Eremin-Solenikov --- net/ieee802154/dgram.c | 14 ++++++++++++++ net/ieee802154/raw.c | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c index 14d3984..ba8b214 100644 --- a/net/ieee802154/dgram.c +++ b/net/ieee802154/dgram.c @@ -377,6 +377,18 @@ int ieee802154_dgram_deliver(struct net_device *dev, struct sk_buff *skb) return ret; } +static int dgram_getsockopt(struct sock *sk, int level, int optname, + char __user *optval, int __user *optlen) +{ + return -EOPNOTSUPP; +} + +static int dgram_setsockopt(struct sock *sk, int level, int optname, + char __user *optval, int __user optlen) +{ + return -EOPNOTSUPP; +} + struct proto ieee802154_dgram_prot = { .name = "IEEE-802.15.4-MAC", .owner = THIS_MODULE, @@ -391,5 +403,7 @@ struct proto ieee802154_dgram_prot = { .connect = dgram_connect, .disconnect = dgram_disconnect, .ioctl = dgram_ioctl, + .getsockopt = dgram_getsockopt, + .setsockopt = dgram_setsockopt, }; diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c index fca44d5..9315977 100644 --- a/net/ieee802154/raw.c +++ b/net/ieee802154/raw.c @@ -238,6 +238,18 @@ void ieee802154_raw_deliver(struct net_device *dev, struct sk_buff *skb) read_unlock(&raw_lock); } +static int raw_getsockopt(struct sock *sk, int level, int optname, + char __user *optval, int __user *optlen) +{ + return -EOPNOTSUPP; +} + +static int raw_setsockopt(struct sock *sk, int level, int optname, + char __user *optval, int __user optlen) +{ + return -EOPNOTSUPP; +} + struct proto ieee802154_raw_prot = { .name = "IEEE-802.15.4-RAW", .owner = THIS_MODULE, @@ -250,5 +262,7 @@ struct proto ieee802154_raw_prot = { .unhash = raw_unhash, .connect = raw_connect, .disconnect = raw_disconnect, + .getsockopt = raw_getsockopt, + .setsockopt = raw_setsockopt, };