Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752625AbbBYCkv (ORCPT ); Tue, 24 Feb 2015 21:40:51 -0500 Received: from mail-wi0-f180.google.com ([209.85.212.180]:57163 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751444AbbBYCkt (ORCPT ); Tue, 24 Feb 2015 21:40:49 -0500 Date: Wed, 25 Feb 2015 04:40:43 +0200 From: Aya Mahfouz To: Andy Whitcroft , Joe Perches , linux-kernel@vger.kernel.org Subject: [PATCH v2] scripts: checkpatch.pl: add 2 new checks on memset calls Message-ID: <20150225024043.GA9120@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Fnux-kernel@vger.kernel.orgrom: Aya Mahfouz User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2903 Lines: 72 This patch adds 2 new checks on memset calls in the file checkpatch.pl as follows: replace memset by eth_zero_addr if the second argument is an address of zeros (0x00). eth_zero_addr is a wrapper function for memset that takes an address array to set as zero. The size address has to be ETH_ALEN. replace memset by eth_broadcast_addr if the second argument is the broadcast address (0xff). eth_broadcast_addr is a wrapper function for memset that sets the passed array the broadcast address. The size of the address has to be ETH_ALEN. Cc: Julia Lawall Signed-off-by: Aya Mahfouz --- v2: adjusted all checks on memset calls to be in one body scripts/checkpatch.pl | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index d124359..ab43d1b 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -4890,10 +4890,10 @@ sub process { } } -# Check for misused memsets +# Check for misused memsets then check for memset(foo, 0x00|0xff, ETH_ALEN) +# calls that could be eth_zero_addr(foo)|eth_broadcast_addr(foo) if ($^V && $^V ge 5.10.0 && - defined $stat && - $stat =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/s) { + $line =~ /^\+(?:.*?)\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*$FuncArg\s*\)/s) { my $ms_addr = $2; my $ms_val = $7; @@ -4901,10 +4901,22 @@ sub process { if ($ms_size =~ /^(0x|)0$/i) { ERROR("MEMSET", - "memset to 0's uses 0 as the 2nd argument, not the 3rd\n" . "$here\n$stat\n"); + "memset to 0's uses 0 as the 2nd argument, not the 3rd\n" . "$here\n$line\n"); } elsif ($ms_size =~ /^(0x|)1$/i) { WARN("MEMSET", - "single byte memset is suspicious. Swapped 2nd/3rd argument?\n" . "$here\n$stat\n"); + "single byte memset is suspicious. Swapped 2nd/3rd argument?\n" . "$here\n$line\n"); + } elsif ($ms_size =~ /^ETH_ALEN/i) { + if ($ms_val =~ /^0x00/i && WARN("PREFER_ETH_ZERO_ADDR", + "Prefer eth_zero_addr() over memset() if the second address is 0x00\n" . $herecurr) && + $fix) { + + $fixed[$fixlinenr] =~ s/\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/eth_zero_addr($ms_addr)/; + } elsif ($ms_val =~ /^0xff/i && WARN("PREFER_ETH_BROADCAST_ADDR", + "Prefer eth_broadcast_addr() over memset() if the second address is 0xff\n" . $herecurr) && + $fix) { + + $fixed[$fixlinenr] =~ s/\bmemset\s*\(\s*$FuncArg\s*,\s*$FuncArg\s*\,\s*ETH_ALEN\s*\)/eth_broadcast_addr($ms_addr)/; + } } } -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/