From patchwork Wed Aug 5 07:28:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 30779 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 3D2F9B7079 for ; Wed, 5 Aug 2009 17:29:05 +1000 (EST) Received: by ozlabs.org (Postfix) id 31803DDDA2; Wed, 5 Aug 2009 17:29:05 +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 AE231DDD0B for ; Wed, 5 Aug 2009 17:29:04 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933365AbZHEH25 (ORCPT ); Wed, 5 Aug 2009 03:28:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933685AbZHEH24 (ORCPT ); Wed, 5 Aug 2009 03:28:56 -0400 Received: from fg-out-1718.google.com ([72.14.220.152]:39992 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933668AbZHEH2w (ORCPT ); Wed, 5 Aug 2009 03:28:52 -0400 Received: by fg-out-1718.google.com with SMTP id e12so819624fga.17 for ; Wed, 05 Aug 2009 00:28:52 -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=B8V9w8a/ZG21g4yS60sclKCsWvih/D9h2uDwnLOsIxk=; b=HKLAVRWeiJ1KfrJ5mfxwZFyfapdVEaK65twhjwtCO3fKwf2G3ZUw9QuNr41whi9d8/ GHWzrNammadCe3n6fD6S/chaIsYmsHQXf/OWjAO3AT5Wq4dqXhSY/dhDpsYM1x8xodzJ 4EYldjFZ0CM9qXvjr7oeE/EvOSLqT/ORmsiKA= 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=tcGILNVOxPVGS2uMHQwBSpS1ORJilel/DY1tqX14Q/CR2cG+h6iJn+XX7sw6xqs+jF pG90HFX6cZ90NsZsHrFi/Ncz/utk44rcrpgKzQoctnZCrs3gFwfQaoeY3xY9CxaxGh5z xGyH/SEeNyE1sg4EJEQVGcN+7Z82/8k1T9Nik= Received: by 10.86.81.16 with SMTP id e16mr1671559fgb.78.1249457331963; Wed, 05 Aug 2009 00:28:51 -0700 (PDT) Received: from localhost.localdomain (ppp91-122-1-214.pppoe.avangarddsl.ru [91.122.1.214]) by mx.google.com with ESMTPS id e11sm7292805fga.11.2009.08.05.00.28.50 (version=SSLv3 cipher=RC4-MD5); Wed, 05 Aug 2009 00:28:51 -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/3] af_ieee802154: provide dummy get/setsockopt Date: Wed, 5 Aug 2009 11:28:16 +0400 Message-Id: <1249457297-8355-3-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1249457297-8355-2-git-send-email-dbaryshkov@gmail.com> References: <1249457297-8355-1-git-send-email-dbaryshkov@gmail.com> <1249457297-8355-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 53dd912..d1da6c6 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 ea8d1f1..60dee69 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, };