From patchwork Sat Oct 12 09:21:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuseppe Longo X-Patchwork-Id: 283000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 0E5C82C0339 for ; Sat, 12 Oct 2013 20:21:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752163Ab3JLJVf (ORCPT ); Sat, 12 Oct 2013 05:21:35 -0400 Received: from mail-bk0-f51.google.com ([209.85.214.51]:49482 "EHLO mail-bk0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752095Ab3JLJVe (ORCPT ); Sat, 12 Oct 2013 05:21:34 -0400 Received: by mail-bk0-f51.google.com with SMTP id mx10so1944477bkb.38 for ; Sat, 12 Oct 2013 02:21:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=vDBaf3QuPMsp6lN5XuUHd4SgTbRihRHKPix5lNiVYIQ=; b=bPJ7u7ZPysyC5trCro/ktikTzyffwHv1OV7X+Gf36sm/+DxxnOoknrYiJw3U09Us0a ILKD74P65rOlQlJRzIcbdvRMCEf5U1UEu1qn9DmHz6MlXFd7rmAbKeRw0J1jZeGIIHYE Q7drXh70c7UCFgBG1BAJpXECaS2VzoCJidQvMv/20BQmBzhUZ+XExVqvZcH+g2cpfg4A 6SrLP7GHZVZ/taGPEuJ4HtgzeqkfGLe7GMSNh5rBOxQDvi0JxANWHpafkSwxu1ju3+Y+ im8Bt6Jxxvkvy1hH75M+rVGzlN3VvL95bW9HOPIJTB9awqyQAZQmVYRakss7HpP5C1Bs KzwA== X-Received: by 10.204.68.142 with SMTP id v14mr20971565bki.18.1381569693555; Sat, 12 Oct 2013 02:21:33 -0700 (PDT) Received: from localhost.localdomain ([46.182.88.230]) by mx.google.com with ESMTPSA id l9sm504679bkg.0.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sat, 12 Oct 2013 02:21:33 -0700 (PDT) From: Giuseppe Longo To: netfilter-devel@vger.kernel.org Cc: Giuseppe Longo Subject: [PATCH] nft: arp: fix STRING_OVERFLOW Date: Sat, 12 Oct 2013 11:21:52 +0200 Message-Id: <1381569712-7835-1-git-send-email-giuseppelng@gmail.com> X-Mailer: git-send-email 1.7.8.6 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org This patch replace strcat with strncat and strcpy with strncpy fixing possible string overflow. Signed-off-by: Giuseppe Longo --- iptables/nft-arp.c | 4 ++-- iptables/xtables-arp.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c index 08f8814..9792fda 100644 --- a/iptables/nft-arp.c +++ b/iptables/nft-arp.c @@ -459,7 +459,7 @@ nft_arp_print_firewall(struct nft_rule *r, unsigned int num, sprintf(buf, "%s", addr_to_dotted(&(fw.arp.src))); else sprintf(buf, "%s", addr_to_anyname(&(fw.arp.src))); - strcat(buf, mask_to_dotted(&(fw.arp.smsk))); + strncat(buf, mask_to_dotted(&(fw.arp.smsk)), sizeof(buf) - strlen(buf) -1); printf("-s %s ", buf); } @@ -483,7 +483,7 @@ after_devsrc: sprintf(buf, "%s", addr_to_dotted(&(fw.arp.tgt))); else sprintf(buf, "%s", addr_to_anyname(&(fw.arp.tgt))); - strcat(buf, mask_to_dotted(&(fw.arp.tmsk))); + strncat(buf, mask_to_dotted(&(fw.arp.tmsk)), sizeof(buf) - strlen(buf) -1); printf("-d %s ", buf); } diff --git a/iptables/xtables-arp.c b/iptables/xtables-arp.c index 411a699..18f285c 100644 --- a/iptables/xtables-arp.c +++ b/iptables/xtables-arp.c @@ -847,7 +847,8 @@ static struct xtables_target *command_jump(struct arpt_entry *fw, target->t = xtables_calloc(1, size); target->t->u.target_size = size; - strcpy(target->t->u.user.name, jumpto); + strncpy(target->t->u.user.name, jumpto, sizeof(target->t->u.user.name)); + target->t->u.user.name[sizeof(target->t->u.user.name)-1] = '\0'; target->t->u.user.revision = target->revision; xs_init_target(target);