From patchwork Thu Mar 19 18:18:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernard Pidoux X-Patchwork-Id: 24705 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 1D566DDE1B for ; Fri, 20 Mar 2009 05:34:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756017AbZCSSe1 (ORCPT ); Thu, 19 Mar 2009 14:34:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755618AbZCSSe1 (ORCPT ); Thu, 19 Mar 2009 14:34:27 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:42775 "EHLO smtp5-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753474AbZCSSe0 (ORCPT ); Thu, 19 Mar 2009 14:34:26 -0400 X-Greylist: delayed 400 seconds by postgrey-1.27 at vger.kernel.org; Thu, 19 Mar 2009 14:34:25 EDT Received: from smtp5-g21.free.fr (localhost [127.0.0.1]) by smtp5-g21.free.fr (Postfix) with ESMTP id 50978D4819D; Thu, 19 Mar 2009 19:34:18 +0100 (CET) Received: from [192.168.0.66] (car75-2-82-66-61-83.fbx.proxad.net [82.66.61.83]) by smtp5-g21.free.fr (Postfix) with ESMTP id 6E1E4D4820A; Thu, 19 Mar 2009 19:34:16 +0100 (CET) Subject: [PATCH 2/3] [AX25] zero length frame filtering in AX25 From: bernard pidoux To: Linux netdev , David Miller Date: Thu, 19 Mar 2009 19:18:15 +0100 Message-Id: <1237486695.30285.17.camel@f6bvp-11> Mime-Version: 1.0 X-Mailer: Evolution 2.24.2-1.2mdv2009.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In previous commit 244f46ae6e9e18f6fc0be7d1f49febde4762c34b was introduced a zero length frame filter for ROSE protocole. This patch has the same purpose at AX25 frame level for the same reason. Empty frames have no meaning in AX25 protocole. Signed-off-by: Bernard Pidoux --- net/ax25/af_ax25.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 532a031..ca32f57 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c @@ -1435,6 +1435,11 @@ static int ax25_sendmsg(struct kiocb *iocb, struct socket *sock, size_t size; int lv, err, addr_len = msg->msg_namelen; + /* AX.25 empty data frame has no meaning : don't send */ + if (len == 0) { + return (0); + } + if (msg->msg_flags & ~(MSG_DONTWAIT|MSG_EOR|MSG_CMSG_COMPAT)) return -EINVAL; @@ -1634,6 +1639,13 @@ static int ax25_recvmsg(struct kiocb *iocb, struct socket *sock, skb_reset_transport_header(skb); copied = skb->len; + /* AX.25 empty data frame has no meaning : ignore it */ + if (copied == 0) { + err = copied; + skb_free_datagram(sk, skb); + goto out; + } + if (copied > size) { copied = size; msg->msg_flags |= MSG_TRUNC;