From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3752604-1523237715-2-5580468766470464556 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523237714; b=dGN7qkKaDBIFQnnypNs842YbylINOo1h+8PGLIJmqEYdWgvWXQ FBbj/y104y1dLGWqp84AZMctUgzNFBzxWeGq+DQN5kgl9uz7OHA/+hUdyonkG82k QhHQYJnp6zjzK7Gbh/B+GGMp82C5mFmHOFrMUjCZ0X5GbIIU6WjUIkfzio9wr3pY 40o8DjiE1fBaWChsYP2b/u8bVU7TW8YLaIU5s/U2ECYPj8onCPht+VOJ+KJthT1l ZxxVrYKM67MGB5iBdJjywIzcWnjBm6COcgpehn9oAJiLGFN5V/47PqUpBp/xagKD BjgUs8n6TIzPbltOi0KWVoo15gTAoVcV5K9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=fm2; t=1523237714; bh=/s312puWS8 8UrLu1WagIDH5Qdn8TsbspiVKhMCOtwt4=; b=oa7EA3d8DUn8ydT3/g/GX9fCeP +/ZA/BFfkZy7tmEqrtyrCb7BPWjG5sfVGpCVbKvFrbDGzRG+oxujI8kzgIsF08Zb zghntQc5p/AHi8M7DlP10rMD1x9wM4E2vy8/6kONbhSPGGRjBNLTtzwZdsJ8f7Dh +Mf1skyUppoLbpVutdpST7iaX/nhkPCoa6aZYxIzUyQK6NCARjUgRmUDpYDSO8LD /LPHT3BDgbpZjlpE48kMOvN3USsRIrdoKDVogHLCqkL5cDshcQumZaSco8JNqjI0 B7c4jcxb3n4Ay4p3meoLve0GqP4mJDhH0/lHZeSUPjYD5Ao8M/j9sLvX9ztA== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BiIP1prl x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BiIP1prl x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfHDfMeHO1bbVkJtQlOItv1SOq7AwdMc/9LCU55QzgI/J9szEFEIeUULq1k0gRywZZgRw1l3a7HK3xoABC3We/CcQx0PicQQBR3gUY0VL2M84WezsAccC Xq9j08thhyCz3E6ao0X5VfRGZjQeJPtNAkTM92yNY4XtkimcLV8kwJEH6B+4eiAI4+8cphipHFGR9eQixa3Pth7r1OemGbmOh8sLZWBbP6OUODDSa17uP1Sn X-CM-Analysis: v=2.3 cv=E8HjW5Vl c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=wRwT6uffUbIA:10 a=t_PdEiP4ckcA:10 a=mw6kJ3eo-EIA:10 a=8nJEP1OIZ-IA:10 a=xqWC_Br6kY4A:10 a=Kd1tUaAdevIA:10 a=Lf-vpJhqX20A:10 a=cm27Pg_UAAAA:8 a=pGLkceISAAAA:8 a=AGRr4plBAAAA:8 a=yPCof4ZbAAAA:8 a=yMhMjlubAAAA:8 a=oEvlakYsqTb7HUBMxl8A:9 a=wPNLvfGTeEIA:10 a=xmb-EsYY8bH0VWELuYED:22 a=bOnWt3ThIoLzEnqt84vq:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755475AbeDIAfK (ORCPT ); Sun, 8 Apr 2018 20:35:10 -0400 Received: from mail-sn1nam02on0094.outbound.protection.outlook.com ([104.47.36.94]:35040 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932589AbeDIAfH (ORCPT ); Sun, 8 Apr 2018 20:35:07 -0400 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Kees Cook , Daniel Micay , "Martin K . Petersen" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 023/162] scsi: csiostor: Avoid content leaks and casts Thread-Topic: [PATCH AUTOSEL for 4.4 023/162] scsi: csiostor: Avoid content leaks and casts Thread-Index: AQHTz5mcRC14xsCFl0C2zt4k1c0VGg== Date: Mon, 9 Apr 2018 00:27:59 +0000 Message-ID: <20180409002738.163941-23-alexander.levin@microsoft.com> References: <20180409002738.163941-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002738.163941-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1013;7:MVlZZ2yGzrBeMPM1vs6sDx9ebjS4K2/tkTNYMWDCvrvBQY9htvahdfdX8Snxe9Pg9Y9vKIXnmO9jxh/VYYi/0HLAaavHIn/xk4czq2uCDtd1W/2vtuRz9j2ox7sNehFczOFv0ozZ/CFK4+AobkdzPLunq9SjOCGVcj1jmzeU8/xaR3ExKFY85e14C3pjF0qdmssESy1MvBgIwUPYhHw3RVVOLYusJAS85NmassIAWUz7obJATSLM8NZEv9df/yiO;20:83Rs22J1dBcPmxK8g18JIrwS4CKec9wN7FCdMKKgMfgcpuIXnO7ZmLhcFbe6Y8TUXS3peRx27KDvP6dePA8oh2lx8zo4GZdMwGBm9777ux//sNHgKVFyCrXQFLlE0Tz1NONIqTDAfwMgauD8DS358MXT950zzqLsWpePKpGcyto= X-MS-Office365-Filtering-Correlation-Id: e01dc423-6a61-42e1-0185-08d59db1bd51 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020);SRVR:DM5PR2101MB1013; x-ms-traffictypediagnostic: DM5PR2101MB1013: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(85827821059158)(146099531331640); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1013;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1013; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(39860400002)(396003)(346002)(366004)(376002)(189003)(199004)(478600001)(10290500003)(6436002)(5250100002)(2501003)(14454004)(305945005)(4326008)(66066001)(99286004)(10090500001)(6506007)(36756003)(102836004)(54906003)(486006)(107886003)(76176011)(2900100001)(22452003)(39060400002)(316002)(110136005)(86362001)(3660700001)(2906002)(81166006)(186003)(86612001)(81156014)(2616005)(8936002)(3280700002)(11346002)(53936002)(7736002)(476003)(446003)(72206003)(68736007)(6116002)(5660300001)(106356001)(6666003)(6486002)(8676002)(1076002)(105586002)(26005)(6512007)(3846002)(97736004)(25786009)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1013;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-microsoft-antispam-message-info: ZhgGH/+FuVo1QuT507dhEiY2NT6r+dE6RqfFsc/1xHIGgKybskIE1YsVa271wWEQVlfVQ9sMJlQDZ95Cwn0rwasEEX9JubIYJxG+mDB+eROUlt0nun4RW33zx8tnUEJiXxAU15gH2ySaPA2Y2yh1X39f9qAeiceIo2GWsRW6w4UZWrcRXo6t3hBEC8cEXQ8QXNmBgoWm1q7PsyJ5GwvnmdxFBdBp6LAOIpXFRQ/gCnsIlZsljMOuoQIMVBARXyIBQoUJZx4nggx2zRenjjeI7/diBzmsA2yj0LjHSdoZSpZY1Sn7caTDFzsIHyuDCvyJu7rRAXLMwcyqkbG4FClWQkBhsDoG/8KhYVi2vdOrgJEetW5pUB6sMFDPdwmODGIn7PZysjhKftWPd1D1BN0m0FYjRlcw/Qw3N5i7P/iUb3g= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: e01dc423-6a61-42e1-0185-08d59db1bd51 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:27:59.4579 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1013 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Kees Cook [ Upstream commit 42c335f7e67029d2e01711f2f2bc6252277c8993 ] When copying attributes, the len argument was padded out and the resulting memcpy() would copy beyond the end of the source buffer. Avoid this, and use size_t for val_len to avoid all the casts. Similarly, avoid source buffer casts and use void *. Additionally enforces val_len can be represented by u16 and that the DMA buffer was not overflowed. Fixes the size of mfa, which is not FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN (but it will be padded up to 4). This was noticed by the future CONFIG_FORTIFY_SOURCE checks. Cc: Daniel Micay Signed-off-by: Kees Cook Acked-by: Varun Prakash Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/csiostor/csio_lnode.c | 43 +++++++++++++++++++++++-----------= ---- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/drivers/scsi/csiostor/csio_lnode.c b/drivers/scsi/csiostor/csi= o_lnode.c index c00b2ff72b55..be5ee2d37815 100644 --- a/drivers/scsi/csiostor/csio_lnode.c +++ b/drivers/scsi/csiostor/csio_lnode.c @@ -238,14 +238,23 @@ csio_osname(uint8_t *buf, size_t buf_len) } =20 static inline void -csio_append_attrib(uint8_t **ptr, uint16_t type, uint8_t *val, uint16_t le= n) +csio_append_attrib(uint8_t **ptr, uint16_t type, void *val, size_t val_len= ) { + uint16_t len; struct fc_fdmi_attr_entry *ae =3D (struct fc_fdmi_attr_entry *)*ptr; + + if (WARN_ON(val_len > U16_MAX)) + return; + + len =3D val_len; + ae->type =3D htons(type); len +=3D 4; /* includes attribute type and length */ len =3D (len + 3) & ~3; /* should be multiple of 4 bytes */ ae->len =3D htons(len); - memcpy(ae->value, val, len); + memcpy(ae->value, val, val_len); + if (len > val_len) + memset(ae->value + val_len, 0, len - val_len); *ptr +=3D len; } =20 @@ -335,7 +344,7 @@ csio_ln_fdmi_rhba_cbfn(struct csio_hw *hw, struct csio_= ioreq *fdmi_req) numattrs++; val =3D htonl(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT); csio_append_attrib(&pld, FC_FDMI_PORT_ATTR_SUPPORTEDSPEED, - (uint8_t *)&val, + &val, FC_FDMI_PORT_ATTR_SUPPORTEDSPEED_LEN); numattrs++; =20 @@ -346,23 +355,22 @@ csio_ln_fdmi_rhba_cbfn(struct csio_hw *hw, struct csi= o_ioreq *fdmi_req) else val =3D htonl(CSIO_HBA_PORTSPEED_UNKNOWN); csio_append_attrib(&pld, FC_FDMI_PORT_ATTR_CURRENTPORTSPEED, - (uint8_t *)&val, - FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN); + &val, FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN); numattrs++; =20 mfs =3D ln->ln_sparm.csp.sp_bb_data; csio_append_attrib(&pld, FC_FDMI_PORT_ATTR_MAXFRAMESIZE, - (uint8_t *)&mfs, FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN); + &mfs, sizeof(mfs)); numattrs++; =20 strcpy(buf, "csiostor"); csio_append_attrib(&pld, FC_FDMI_PORT_ATTR_OSDEVICENAME, buf, - (uint16_t)strlen(buf)); + strlen(buf)); numattrs++; =20 if (!csio_hostname(buf, sizeof(buf))) { csio_append_attrib(&pld, FC_FDMI_PORT_ATTR_HOSTNAME, - buf, (uint16_t)strlen(buf)); + buf, strlen(buf)); numattrs++; } attrib_blk->numattrs =3D htonl(numattrs); @@ -444,33 +452,32 @@ csio_ln_fdmi_dprt_cbfn(struct csio_hw *hw, struct csi= o_ioreq *fdmi_req) =20 strcpy(buf, "Chelsio Communications"); csio_append_attrib(&pld, FC_FDMI_HBA_ATTR_MANUFACTURER, buf, - (uint16_t)strlen(buf)); + strlen(buf)); numattrs++; csio_append_attrib(&pld, FC_FDMI_HBA_ATTR_SERIALNUMBER, - hw->vpd.sn, (uint16_t)sizeof(hw->vpd.sn)); + hw->vpd.sn, sizeof(hw->vpd.sn)); numattrs++; csio_append_attrib(&pld, FC_FDMI_HBA_ATTR_MODEL, hw->vpd.id, - (uint16_t)sizeof(hw->vpd.id)); + sizeof(hw->vpd.id)); numattrs++; csio_append_attrib(&pld, FC_FDMI_HBA_ATTR_MODELDESCRIPTION, - hw->model_desc, (uint16_t)strlen(hw->model_desc)); + hw->model_desc, strlen(hw->model_desc)); numattrs++; csio_append_attrib(&pld, FC_FDMI_HBA_ATTR_HARDWAREVERSION, - hw->hw_ver, (uint16_t)sizeof(hw->hw_ver)); + hw->hw_ver, sizeof(hw->hw_ver)); numattrs++; csio_append_attrib(&pld, FC_FDMI_HBA_ATTR_FIRMWAREVERSION, - hw->fwrev_str, (uint16_t)strlen(hw->fwrev_str)); + hw->fwrev_str, strlen(hw->fwrev_str)); numattrs++; =20 if (!csio_osname(buf, sizeof(buf))) { csio_append_attrib(&pld, FC_FDMI_HBA_ATTR_OSNAMEVERSION, - buf, (uint16_t)strlen(buf)); + buf, strlen(buf)); numattrs++; } =20 csio_append_attrib(&pld, FC_FDMI_HBA_ATTR_MAXCTPAYLOAD, - (uint8_t *)&maxpayload, - FC_FDMI_HBA_ATTR_MAXCTPAYLOAD_LEN); + &maxpayload, FC_FDMI_HBA_ATTR_MAXCTPAYLOAD_LEN); len =3D (uint32_t)(pld - (uint8_t *)cmd); numattrs++; attrib_blk->numattrs =3D htonl(numattrs); @@ -1794,6 +1801,8 @@ csio_ln_mgmt_submit_req(struct csio_ioreq *io_req, struct csio_mgmtm *mgmtm =3D csio_hw_to_mgmtm(hw); int rv; =20 + BUG_ON(pld_len > pld->len); + io_req->io_cbfn =3D io_cbfn; /* Upper layer callback handler */ io_req->fw_handle =3D (uintptr_t) (io_req); io_req->eq_idx =3D mgmtm->eq_idx; --=20 2.15.1