From patchwork Mon Oct 11 00:25:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Ortiz X-Patchwork-Id: 67373 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 92709B70A3 for ; Mon, 11 Oct 2010 11:26:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752608Ab0JKA0J (ORCPT ); Sun, 10 Oct 2010 20:26:09 -0400 Received: from mga03.intel.com ([143.182.124.21]:9991 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751042Ab0JKA0I (ORCPT ); Sun, 10 Oct 2010 20:26:08 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 10 Oct 2010 17:26:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.57,311,1283756400"; d="scan'208";a="334438316" Received: from unknown (HELO sortiz-mobl) ([10.255.18.201]) by azsmga001.ch.intel.com with ESMTP; 10 Oct 2010 17:26:06 -0700 From: Samuel Ortiz To: "David S. Miller" Cc: netdev@vger.kernel.org, Samuel Ortiz , stable@kernel.org Subject: [PATCH net-next 4/5] irda: Fix parameter extraction stack overflow Date: Mon, 11 Oct 2010 02:25:01 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Cc: stable@kernel.org Reported-by: Ilja Van Sprundel Signed-off-by: Samuel Ortiz --- net/irda/parameters.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/net/irda/parameters.c b/net/irda/parameters.c index fc1a205..71cd38c 100644 --- a/net/irda/parameters.c +++ b/net/irda/parameters.c @@ -298,6 +298,8 @@ static int irda_extract_string(void *self, __u8 *buf, int len, __u8 pi, p.pi = pi; /* In case handler needs to know */ p.pl = buf[1]; /* Extract length of value */ + if (p.pl > 32) + p.pl = 32; IRDA_DEBUG(2, "%s(), pi=%#x, pl=%d\n", __func__, p.pi, p.pl); @@ -318,7 +320,7 @@ static int irda_extract_string(void *self, __u8 *buf, int len, __u8 pi, (__u8) str[0], (__u8) str[1]); /* Null terminate string */ - str[p.pl+1] = '\0'; + str[p.pl] = '\0'; p.pv.c = str; /* Handler will need to take a copy */