From patchwork Sun Feb 14 12:00:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrew hendry X-Patchwork-Id: 45296 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 32793B7CCD for ; Sun, 14 Feb 2010 23:07:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758463Ab0BNMGy (ORCPT ); Sun, 14 Feb 2010 07:06:54 -0500 Received: from mail-pz0-f197.google.com ([209.85.222.197]:47912 "EHLO mail-pz0-f197.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754372Ab0BNMGw (ORCPT ); Sun, 14 Feb 2010 07:06:52 -0500 Received: by pzk35 with SMTP id 35so421856pzk.33 for ; Sun, 14 Feb 2010 04:06:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=uEW9h3+2CEbjCAxqeblQfT5lxXBqWu+Nb+wBZxkFyR0=; b=M4LELqipHX+qUAIHVCOtD9CYbD6/IEExA6b82qew+WbpDU4D9CLD7QFMPEkvUEcyqN Z1fJq2/NuHyvj8QwZLDG7f3CyLUEgZ7/DgwQeL5s9pi7VYQK35DXgpMVWLu8/MGDAaoM YPt2eMpGa0AW3SHPDMmwV6KJZarCp1gQNkC/4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=wALddAVbFSbS2XXjUjzIwiC5ry5T52lQ1f15Awy+MsouZ2m9AwgwUQ9XRb+Vn9h6g/ ODo4KWMadHpSblYkOBDjxKxnszLbNsaA6lRHr5o2PGO2gT66zp5YKhV7svkeBFLKitpQ 6T8zpGfRPdo6MhZGGukZHnKKzK2IcCWAKsW4g= Received: by 10.142.5.35 with SMTP id 35mr2544186wfe.276.1266148854495; Sun, 14 Feb 2010 04:00:54 -0800 (PST) Received: from ?192.168.0.2? (124-168-50-123.dyn.iinet.net.au [124.168.50.123]) by mx.google.com with ESMTPS id 22sm3275907pzk.1.2010.02.14.04.00.48 (version=SSLv3 cipher=RC4-MD5); Sun, 14 Feb 2010 04:00:53 -0800 (PST) Subject: [PATCH 2/2] X25: Dont let x25_bind use addresses containing characters From: Andrew Hendry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Date: Sun, 14 Feb 2010 23:00:45 +1100 Message-ID: <1266148845.4731.45.camel@ibex> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Addresses should be all digits. Stops x25_bind using addresses containing characters. Signed-off-by: Andrew Hendry diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 6c7104e..8cc7583 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -55,6 +55,7 @@ #include #include #include +#include #include #include @@ -648,7 +649,7 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) { struct sock *sk = sock->sk; struct sockaddr_x25 *addr = (struct sockaddr_x25 *)uaddr; - int rc = 0; + int len, i, rc = 0; lock_kernel(); if (!sock_flag(sk, SOCK_ZAPPED) || @@ -658,6 +659,14 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) goto out; } + len = strlen(addr->sx25_addr.x25_addr); + for (i = 0; i < len; i++) { + if (!isdigit(addr->sx25_addr.x25_addr[i])) { + rc = -EINVAL; + goto out; + } + } + x25_sk(sk)->source_addr = addr->sx25_addr; x25_insert_socket(sk); sock_reset_flag(sk, SOCK_ZAPPED);