Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932218AbbERPd2 (ORCPT ); Mon, 18 May 2015 11:33:28 -0400 Received: from st11p01mm-asmtp001.mac.com ([17.172.204.239]:57858 "EHLO st11p01mm-asmtp001.mac.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932184AbbERPdO convert rfc822-to-8bit (ORCPT ); Mon, 18 May 2015 11:33:14 -0400 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.14.151,1.0.33,0.0.0000 definitions=2015-05-18_04:2015-05-18,2015-05-18,1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=1 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1412110000 definitions=main-1505180190 From: Louis Langholtz Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 8BIT Subject: [PATCH] include/linux: avoid narrowing length parameter values Date: Mon, 18 May 2015 09:33:10 -0600 Message-id: <45D183F5-DFCC-4FBF-833E-E738E098CF1D@me.com> Cc: Al Viro To: linux-kernel@vger.kernel.org MIME-version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) X-Mailer: Apple Mail (2.1878.6) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1798 Lines: 39 memcpy_from_msg() and memcpy_to_msg() functions previously called memcpy_fromiovec() and memcpy_toiovec() functions respectively. The memcpy_fromiovec() and memcpy_toiovec() functions took a length parameter of type int. memcpy_from_msg() and memcpy_to_msg() now call copy_from_iter() and copy_to_iter() functions respectively which take a length parameter of type size_t. Most code calling the memcpy_from_msg() and memcpy_to_msg() functions currently pass a length value of type size_t. This patch updates the memcpy_from_msg() and memcpy_to_msg() functions concordantly to take the length parameter of type size_t. This also avoids a potential for data narrowing. Signed-off-by: Louis Langholtz -- diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 45e0aa6..ee590fb 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -2708,12 +2708,12 @@ int skb_ensure_writable(struct sk_buff *skb, int write_len); int skb_vlan_pop(struct sk_buff *skb); int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci); -static inline int memcpy_from_msg(void *data, struct msghdr *msg, int len) +static inline int memcpy_from_msg(void *data, struct msghdr *msg, size_t len) { return copy_from_iter(data, len, &msg->msg_iter) == len ? 0 : -EFAULT; } -static inline int memcpy_to_msg(struct msghdr *msg, void *data, int len) +static inline int memcpy_to_msg(struct msghdr *msg, void *data, size_t len) { return copy_to_iter(data, len, &msg->msg_iter) == len ? 0 : -EFAULT; } -- 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/