{"id":808223,"url":"http://patchwork.ozlabs.org/api/patches/808223/?format=json","web_url":"http://patchwork.ozlabs.org/project/lede/patch/1504181291-29592-2-git-send-email-dedeckeh@gmail.com/","project":{"id":54,"url":"http://patchwork.ozlabs.org/api/projects/54/?format=json","name":"LEDE development","link_name":"lede","list_id":"lede-dev.lists.infradead.org","list_email":"lede-dev@lists.infradead.org","web_url":"http://lede-project.org/","scm_url":"","webscm_url":"http://git.lede-project.org/","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504181291-29592-2-git-send-email-dedeckeh@gmail.com>","list_archive_url":null,"date":"2017-08-31T12:08:11","name":"[LEDE-DEV,ubox,2/2] kmodloader: log error message in case of out of memory","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"581b8dbcd9eff33c1a85363282c9ff6f1e9e72b8","submitter":{"id":65331,"url":"http://patchwork.ozlabs.org/api/people/65331/?format=json","name":"Hans Dedecker","email":"dedeckeh@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/lede/patch/1504181291-29592-2-git-send-email-dedeckeh@gmail.com/mbox/","series":[{"id":813,"url":"http://patchwork.ozlabs.org/api/series/813/?format=json","web_url":"http://patchwork.ozlabs.org/project/lede/list/?series=813","date":"2017-08-31T12:08:11","name":"[LEDE-DEV,ubox,v3,1/2] kmodloader: lift restriction on module alias info","version":1,"mbox":"http://patchwork.ozlabs.org/series/813/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/808223/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808223/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"j/QD8HeA\"; \n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"szXa8yZE\"; dkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjh4J3YpHz9s7c\n\tfor ;\n\tThu, 31 Aug 2017 22:09:04 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dnOHB-0000jx-Jj; Thu, 31 Aug 2017 12:08:49 +0000","from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241])\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dnOH6-0000Nb-30\n\tfor lede-dev@lists.infradead.org; Thu, 31 Aug 2017 12:08:47 +0000","by mail-wr0-x241.google.com with SMTP id a47so333868wra.2\n\tfor ;\n\tThu, 31 Aug 2017 05:08:23 -0700 (PDT)","from cplx43.eu.thmulti.com ([141.11.62.7])\n\tby smtp.gmail.com with ESMTPSA id\n\tm78sm3768439wmi.3.2017.08.31.05.08.20\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tThu, 31 Aug 2017 05:08:21 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe:\n\tList-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References:\n\tIn-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=dIWS5Ym+pDLiVz5ZoJZzBi7q+g5nrQs3ct5wOzpSizE=;\n\tb=j/QD8HeARR4oRl\n\tM5pb0Pv1rJOpRJC3G4uc3Crug5tl3+oTuBgSGXpgEaHL2MmmkSyNgVB7zOCsK5xA8dQhVHGfQ9/K/\n\tHshMQtc5Fyho7pXTsG7Wpk+yp1SVuCWBBDw2DcnFwMb1wScuV2rA+f1iNokaYI3Bi52Gh3IFnv3TB\n\t2ShVE1vJxmee33I7g78BOFhakgjd+Ive2Ocf7Sy6OozQS9FanhdHpMPmiKEv5pIsOe0Y3Uv0kDHM+\n\t/BMRHeq+o0T4NMOPiqBqDL1dXDtIVUO4eVSyO8H4535ziPxNvoWpuoM0sq+FhOj0DQZhq7BxvaDow\n\tvbb0FM4bkvvRbSdfwNTA==;","v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=yvk+HrIDi5vkqWWxkr5dQ5aegonKTBnmKTvK5LDPVzA=;\n\tb=szXa8yZERozJX50sv78DNGKcCzJ1lT/AZR6JZcRzERHpBoaaihDbF3HHQeIEVGoAln\n\tM10OEAxi1rUGnvKhftjvY3TLOcpLfp0H2b2Du2QWVsqIKpinRpmFYr4UMHlvI959Km/m\n\tAOrEsFgZZFCS8XMzEQm2DHURrwyI9D5DJci2bumL659s1liFRgdfWsaB45qiX+/pyzwU\n\teMeFxNk7DKqgjSe/7mFksdoCHbhXSPYiQf3gB3qbIJDcNNCWWLG4UdZuIeg/g61EodQV\n\tEp21OIEq7fNohQWUhSpJ83FuJN14CV5y/nzdWDFH9uSG6bgT2C/uDhpcnhjUgsy1GFU1\n\tPBvg=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=yvk+HrIDi5vkqWWxkr5dQ5aegonKTBnmKTvK5LDPVzA=;\n\tb=bM/hTyzpu+Gze9rdxk1fu+dDbtdEhsHT9smCylLH3+NYbh9uQiDw9HNILLr33yNcuj\n\twZs+V3wVU8VsTVjP/49NJnN5W4Ju5X5JU2rmx/+rG1GCFuKb87hizy8rlth2JHId9ojI\n\tWRemkIJgeHMCeYcPShA5HqfT33WlPKrz1O8zCx+nEZsCpNSEfOPpp7pfl0F2zC4rDThm\n\twcOoO3IAeyun4W8GOcPVlek/MDFFVZIBzRnja1OYCyHoTsQbICUv/bsQUi5v4amUUexh\n\t8xjrFdOsVP2FIRapmhIVEdtI3idqP/u6TW04eOM6PWKi3rZc+rl/EZuaqTfwKtz/2Rm/\n\tSSMQ==","X-Gm-Message-State":"AHYfb5goSv+QJ8bYYpHQm3q/GU6JEBklUelbbqy5xXBv8Z7mELOgw9s4\n\tjp0Y6bCn+qa/3VS/","X-Google-Smtp-Source":"ADKCNb6EEKrRBdqJx4yyqMog64Ma4B11CODVUzNjd/8AWop96KqN7HthsQNvmuV81T6r2B3mu2H7Hg==","X-Received":"by 10.223.195.138 with SMTP id p10mr3083319wrf.9.1504181301979; \n\tThu, 31 Aug 2017 05:08:21 -0700 (PDT)","From":"Hans Dedecker ","To":"lede-dev@lists.infradead.org,\n\tjohn@phrozen.org,\n\tyszhou4tech@gmail.com","Date":"Thu, 31 Aug 2017 14:08:11 +0200","Message-Id":"<1504181291-29592-2-git-send-email-dedeckeh@gmail.com>","X-Mailer":"git-send-email 1.9.1","In-Reply-To":"<1504181291-29592-1-git-send-email-dedeckeh@gmail.com>","References":"<1504181291-29592-1-git-send-email-dedeckeh@gmail.com>","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170831_050844_375117_10B23E81 ","X-CRM114-Status":"UNSURE ( 9.69 )","X-CRM114-Notice":"Please train this message.","X-Spam-Score":"-2.0 (--)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-2.0 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/,\n\tno\n\ttrust [2a00:1450:400c:c0c:0:0:0:241 listed in] [list.dnswl.org]\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\n\tprovider (dedeckeh[at]gmail.com)\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]\n\t-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature\n\t0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n\tnot necessarily valid\n\t-0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from\n\tauthor's domain","Subject":"[LEDE-DEV] [PATCH ubox 2/2] kmodloader: log error message in case\n\tof out of memory","X-BeenThere":"lede-dev@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Hans Dedecker ","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"Lede-dev\" ","Errors-To":"lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"Log \"out of memory\" error message in case of OOM\n\nSigned-off-by: Hans Dedecker \n---\n kmodloader.c | 13 ++++++++++---\n 1 file changed, 10 insertions(+), 3 deletions(-)","diff":"diff --git a/kmodloader.c b/kmodloader.c\nindex 94cfc42..1b6488f 100644\n--- a/kmodloader.c\n+++ b/kmodloader.c\n@@ -95,8 +95,10 @@ static int init_module_folders(void)\n \t\tif (!stat(path, &st) && S_ISDIR(st.st_mode)) {\n \t\t\tmodule_folders = realloc(module_folders, sizeof(p) * (n + 2));\n \n-\t\t\tif (!module_folders)\n+\t\t\tif (!module_folders) {\n+\t\t\t\tULOG_ERR(\"out of memory\\n\");\n \t\t\t\treturn -1;\n+\t\t\t}\n \n \t\t\tmodule_folders[n++] = strdup(path);\n \t\t}\n@@ -569,8 +571,10 @@ static int insert_module(char *path, const char *options)\n \t}\n \n \tdata = malloc(s.st_size);\n-\tif (!data)\n+\tif (!data) {\n+\t\tULOG_ERR(\"out of memory\\n\");\n \t\tgoto out;\n+\t}\n \n \tif (read(fd, data, s.st_size) == s.st_size) {\n \t\tret = syscall(__NR_init_module, data, (unsigned long) s.st_size, options);\n@@ -703,6 +707,7 @@ static int main_insmod(int argc, char **argv)\n \n \toptions = malloc(len);\n \tif (!options) {\n+\t\tULOG_ERR(\"out of memory\\n\");\n \t\tret = -1;\n \t\tgoto err;\n \t}\n@@ -912,8 +917,10 @@ static int main_loader(int argc, char **argv)\n \t\tdir = argv[1];\n \n \tpath = malloc(strlen(dir) + 2);\n-\tif (!path)\n+\tif (!path) {\n+\t\tULOG_ERR(\"out of memory\\n\");\n \t\treturn -1;\n+\t}\n \n \tstrcpy(path, dir);\n \tstrcat(path, \"*\");\n","prefixes":["LEDE-DEV","ubox","2/2"]}